From: Junio C Hamano Date: Mon, 8 Jul 2024 05:50:37 +0000 (-0700) Subject: Merge https://github.com/j6t/git-gui X-Git-Tag: v2.46.0-rc0~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c9be4c9d6cfe32a77782116f6b66940fa19c86b;p=thirdparty%2Fgit.git Merge https://github.com/j6t/git-gui * https://github.com/j6t/git-gui: git-gui: fix inability to quit after closing another instance git-gui: sv.po: Update Swedish translation (576t0f0u) git-gui: note the new maintainer Makefile(s): do not enforce "all indents must be done with tab" Makefile(s): avoid recipe prefix in conditional statements doc: switch links to https doc: update links to current pages git-gui: po: fix typo in French "aperçu" --- 5c9be4c9d6cfe32a77782116f6b66940fa19c86b diff --cc git-gui/README.md index b460b649a8,0000000000..948e9250d5 mode 100644,000000..100644 --- a/git-gui/README.md +++ b/git-gui/README.md @@@ -1,174 -1,0 +1,174 @@@ +# Git GUI - A graphical user interface for Git + +Git GUI allows you to use the [Git source control management +tools](https://git-scm.com/) via a GUI. This includes staging, committing, +adding, pushing, etc. It can also be used as a blame viewer, a tree browser, +and a citool (make exactly one commit before exiting and returning to shell). +More details about Git GUI can be found in its manual page by either running +`man git-gui`, or by visiting the [online manual +page](https://git-scm.com/docs/git-gui). + +Git GUI was initially written by Shawn O. Pearce, and is distributed with the +standard Git installation. + +# Building and installing + +You need to have the following dependencies installed before you begin: + +- Git +- Tcl +- Tk +- wish +- Gitk (needed for browsing history) +- msgfmt + +Most of Git GUI is written in Tcl, so there is no compilation involved. Still, +some things do need to be done (mostly some substitutions), so you do need to +"build" it. + +You can build Git GUI using: + +``` +make +``` + +And then install it using: + +``` +make install +``` + +You probably need to have root/admin permissions to install. + +# Contributing + - The project is currently maintained by Pratyush Yadav over at - https://github.com/prati0100/git-gui. Even though the project is hosted at ++The project is currently maintained by Johannes Sixt at ++https://github.com/j6t/git-gui. Even though the project is hosted at +GitHub, the development does not happen over GitHub Issues and Pull Requests. +Instead, an email based workflow is used. The Git mailing list +[git@vger.kernel.org](mailto:git@vger.kernel.org) is where the patches are +discussed and reviewed. + +More information about the Git mailing list and instructions to subscribe can +be found [here](https://git.wiki.kernel.org/index.php/GitCommunity). + +## Sending your changes + +Since the development happens over email, you need to send in your commits in +text format. Commits can be converted to emails via the two tools provided by +Git: `git-send-email` and `git-format-patch`. + +You can use `git-format-patch` to generate patches in mbox format from your +commits that can then be sent via email. Let's say you are working on a branch +called 'foo' that was created on top of 'master'. You can run: + +``` +git format-patch -o output_dir master..foo +``` + +to convert all the extra commits in 'foo' into a set of patches saved in the +folder `output_dir`. + +If you are sending multiple patches, it is recommended to include a cover +letter. A cover letter is an email explaining in brief what the series is +supposed to do. A cover letter template can be generated by passing +`--cover-letter` to `git-format-patch`. + +After you send your patches, you might get a review suggesting some changes. +Make those changes, and re-send your patch(es) in reply to the first patch of +your initial version. Also please mention the version of the patch. This can be +done by passing `-v X` to `git-format-patch`, where 'X' is the version number +of the patch(es). + +### Using git-send-email + +You can use `git-send-email` to send patches generated via `git-format-patch`. +While you can directly send patches via `git-send-email`, it is recommended +that you first use `git-format-patch` to generate the emails, audit them, and +then send them via `git-send-email`. + +A pretty good guide to configuring and using `git-send-email` can be found +[here](https://www.freedesktop.org/wiki/Software/PulseAudio/HowToUseGitSendEmail/). + +### Using your email client + +If your email client supports sending mbox format emails, you can use +`git-format-patch` to get an mbox file for each commit, and then send them. If +there is more than one patch in the series, then all patches after the first +patch (or the cover letter) need to be sent as replies to the first. +`git-send-email` does this by default. + +### Using GitGitGadget + +Since some people prefer a GitHub pull request based workflow, they can use +[GitGitGadget](https://gitgitgadget.github.io/) to send in patches. The tool +was originally written for sending patches to the Git project, but it now also +supports sending patches for git-gui. + +Instructions for using GitGitGadget to send git-gui patches, courtesy of +Johannes Schindelin: + +If you don't already have a fork of the [git/git](https://github.com/git/git) +repo, you need to make one. Then clone your fork: + +``` +git clone https://github.com//git +``` + +Then add GitGitGadget as a remote: + +``` +git remote add gitgitgadget https://github.com/gitgitgadget/git +``` + +Then fetch the git-gui branch: + +``` +git fetch gitgitgadget git-gui/master +``` + +Then create a new branch based on git-gui/master: + +``` +git checkout -b git-gui/master +``` + +Make whatever commits you need to, push them to your fork, and then head over +to https://github.com/gitgitgadget/git/pulls and open a Pull Request targeting +git-gui/master. + +GitGitGadget will welcome you with a (hopefully) helpful message. + +## Signing off + +You need to sign off your commits before sending them to the list. You can do +that by passing the `-s` option to `git-commit`. You can also use the "Sign +Off" option in Git GUI. + +A sign-off is a simple 'Signed-off-by: A U Thor \' line at +the end of the commit message, after your explanation of the commit. + +A sign-off means that you are legally allowed to send the code, and it serves +as a certificate of origin. More information can be found at +[developercertificate.org](https://developercertificate.org/). + +## Responding to review comments + +It is quite likely your patches will get review comments. Those comments are +sent on the Git mailing list as replies to your patch, and you will usually be +Cc'ed in those replies. + +You are expected to respond by either explaining your code further to convince +the reviewer what you are doing is correct, or acknowledge the comments and +re-send the patches with those comments addressed. + +Some tips for those not familiar with communication on a mailing list: + +- Use only plain text emails. No HTML at all. +- Wrap lines at around 75 characters. +- Do not send attachments. If you do need to send some files, consider using a + hosting service, and paste the link in your email. +- Do not [top post](http://www.idallen.com/topposting.html). +- Always "reply all". Keep all correspondents and the list in Cc. If you reply + directly to a reviewer, and not Cc the list, other people would not be able + to chime in. diff --cc git-gui/po/fr.po index 0aff18691d,0000000000..878df65399 mode 100644,000000..100644 --- a/git-gui/po/fr.po +++ b/git-gui/po/fr.po @@@ -1,2604 -1,0 +1,2604 @@@ +# translation of fr.po to French +# Translation of git-gui to French. +# Copyright (C) 2008 Shawn Pearce, et al. +# This file is distributed under the same license as the git package. +# +# Christian Couder , 2008. +# Alexandre Bourget , 2008. +msgid "" +msgstr "" +"Project-Id-Version: fr\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-01-26 15:47-0800\n" +"PO-Revision-Date: 2010-02-02 12:59+0100\n" +"Last-Translator: Christian Couder \n" +"Language-Team: French\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 +#: git-gui.sh:922 +msgid "git-gui: fatal error" +msgstr "git-gui: erreur fatale" + +#: git-gui.sh:743 +#, tcl-format +msgid "Invalid font specified in %s:" +msgstr "Police invalide spécifiée dans %s :" + +#: git-gui.sh:779 +msgid "Main Font" +msgstr "Police principale" + +#: git-gui.sh:780 +msgid "Diff/Console Font" +msgstr "Police diff/console" + +#: git-gui.sh:794 +msgid "Cannot find git in PATH." +msgstr "Impossible de trouver git dans PATH." + +#: git-gui.sh:821 +msgid "Cannot parse Git version string:" +msgstr "Impossible de parser la version de Git :" + +#: git-gui.sh:839 +#, tcl-format +msgid "" +"Git version cannot be determined.\n" +"\n" +"%s claims it is version '%s'.\n" +"\n" +"%s requires at least Git 1.5.0 or later.\n" +"\n" +"Assume '%s' is version 1.5.0?\n" +msgstr "" +"Impossible de déterminer la version de Git.\n" +"\n" +"%s affirme qu'il s'agit de la version '%s'.\n" +"\n" +"%s nécessite au moins Git 1.5.0.\n" +"\n" +"Peut-on considérer que '%s' est en version 1.5.0 ?\n" + +#: git-gui.sh:1128 +msgid "Git directory not found:" +msgstr "Impossible de trouver le répertoire git :" + +#: git-gui.sh:1146 +msgid "Cannot move to top of working directory:" +msgstr "Impossible d'aller à la racine du répertoire de travail :" + +#: git-gui.sh:1154 +msgid "Cannot use bare repository:" +msgstr "Impossible d'utiliser un dépôt nu (bare) :" + +#: git-gui.sh:1162 +msgid "No working directory" +msgstr "Aucun répertoire de travail" + +#: git-gui.sh:1334 lib/checkout_op.tcl:306 +msgid "Refreshing file status..." +msgstr "Rafraîchissement du statut des fichiers..." + +#: git-gui.sh:1390 +msgid "Scanning for modified files ..." +msgstr "Recherche de fichiers modifiés..." + +#: git-gui.sh:1454 +msgid "Calling prepare-commit-msg hook..." +msgstr "Lancement de l'action de préparation du message de commit..." + +#: git-gui.sh:1471 +msgid "Commit declined by prepare-commit-msg hook." +msgstr "Commit refusé par l'action de préparation du message de commit." + +#: git-gui.sh:1629 lib/browser.tcl:246 +msgid "Ready." +msgstr "Prêt." + +#: git-gui.sh:1787 +#, tcl-format +msgid "Displaying only %s of %s files." +msgstr "Affiche seulement %s fichiers sur %s." + +#: git-gui.sh:1913 +msgid "Unmodified" +msgstr "Non modifié" + +#: git-gui.sh:1915 +msgid "Modified, not staged" +msgstr "Modifié, pas indexé" + +#: git-gui.sh:1916 git-gui.sh:1924 +msgid "Staged for commit" +msgstr "Indexé" + +#: git-gui.sh:1917 git-gui.sh:1925 +msgid "Portions staged for commit" +msgstr "Portions indexées" + +#: git-gui.sh:1918 git-gui.sh:1926 +msgid "Staged for commit, missing" +msgstr "Indexés, manquant" + +#: git-gui.sh:1920 +msgid "File type changed, not staged" +msgstr "Le type de fichier a changé, non indexé" + +#: git-gui.sh:1921 +msgid "File type changed, staged" +msgstr "Le type de fichier a changé, indexé" + +#: git-gui.sh:1923 +msgid "Untracked, not staged" +msgstr "Non versionné, non indexé" + +#: git-gui.sh:1928 +msgid "Missing" +msgstr "Manquant" + +#: git-gui.sh:1929 +msgid "Staged for removal" +msgstr "Indexé pour suppression" + +#: git-gui.sh:1930 +msgid "Staged for removal, still present" +msgstr "Indexé pour suppression, toujours présent" + +#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 +#: git-gui.sh:1936 git-gui.sh:1937 +msgid "Requires merge resolution" +msgstr "Nécessite la résolution d'une fusion" + +#: git-gui.sh:1972 +msgid "Starting gitk... please wait..." +msgstr "Lancement de gitk... un instant..." + +#: git-gui.sh:1984 +msgid "Couldn't find gitk in PATH" +msgstr "Impossible de trouver gitk dans PATH." + +#: git-gui.sh:2043 +msgid "Couldn't find git gui in PATH" +msgstr "Impossible de trouver git gui dans PATH" + +#: git-gui.sh:2455 lib/choose_repository.tcl:36 +msgid "Repository" +msgstr "Dépôt" + +#: git-gui.sh:2456 +msgid "Edit" +msgstr "Édition" + +#: git-gui.sh:2458 lib/choose_rev.tcl:561 +msgid "Branch" +msgstr "Branche" + +#: git-gui.sh:2461 lib/choose_rev.tcl:548 +msgid "Commit@@noun" +msgstr "Commit" + +#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +msgid "Merge" +msgstr "Fusionner" + +#: git-gui.sh:2465 lib/choose_rev.tcl:557 +msgid "Remote" +msgstr "Dépôt distant" + +#: git-gui.sh:2468 +msgid "Tools" +msgstr "Outils" + +#: git-gui.sh:2477 +msgid "Explore Working Copy" +msgstr "Explorer la copie de travail" + +#: git-gui.sh:2483 +msgid "Browse Current Branch's Files" +msgstr "Naviguer dans la branche courante" + +#: git-gui.sh:2487 +msgid "Browse Branch Files..." +msgstr "Naviguer dans la branche..." + +#: git-gui.sh:2492 +msgid "Visualize Current Branch's History" +msgstr "Visualiser l'historique de la branche courante" + +#: git-gui.sh:2496 +msgid "Visualize All Branch History" +msgstr "Voir l'historique de toutes les branches" + +#: git-gui.sh:2503 +#, tcl-format +msgid "Browse %s's Files" +msgstr "Parcourir l'arborescence de %s" + +#: git-gui.sh:2505 +#, tcl-format +msgid "Visualize %s's History" +msgstr "Voir l'historique de la branche : %s" + +#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 +msgid "Database Statistics" +msgstr "Statistiques du dépôt" + +#: git-gui.sh:2513 lib/database.tcl:34 +msgid "Compress Database" +msgstr "Comprimer le dépôt" + +#: git-gui.sh:2516 +msgid "Verify Database" +msgstr "Vérifier le dépôt" + +#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 +#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 +msgid "Create Desktop Icon" +msgstr "Créer une icône sur le bureau" + +#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 +msgid "Quit" +msgstr "Quitter" + +#: git-gui.sh:2547 +msgid "Undo" +msgstr "Défaire" + +#: git-gui.sh:2550 +msgid "Redo" +msgstr "Refaire" + +#: git-gui.sh:2554 git-gui.sh:3109 +msgid "Cut" +msgstr "Couper" + +#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 +#: lib/console.tcl:69 +msgid "Copy" +msgstr "Copier" + +#: git-gui.sh:2560 git-gui.sh:3115 +msgid "Paste" +msgstr "Coller" + +#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 +#: lib/remote_branch_delete.tcl:38 +msgid "Delete" +msgstr "Supprimer" + +#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 +msgid "Select All" +msgstr "Tout sélectionner" + +#: git-gui.sh:2576 +msgid "Create..." +msgstr "Créer..." + +#: git-gui.sh:2582 +msgid "Checkout..." +msgstr "Charger (checkout)..." + +#: git-gui.sh:2588 +msgid "Rename..." +msgstr "Renommer..." + +#: git-gui.sh:2593 +msgid "Delete..." +msgstr "Supprimer..." + +#: git-gui.sh:2598 +msgid "Reset..." +msgstr "Réinitialiser..." + +#: git-gui.sh:2608 +msgid "Done" +msgstr "Effectué" + +#: git-gui.sh:2610 +msgid "Commit@@verb" +msgstr "Commiter@@verb" + +#: git-gui.sh:2619 git-gui.sh:3050 +msgid "New Commit" +msgstr "Nouveau commit" + +#: git-gui.sh:2627 git-gui.sh:3057 +msgid "Amend Last Commit" +msgstr "Corriger dernier commit" + +#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 +msgid "Rescan" +msgstr "Recharger modifs." + +#: git-gui.sh:2643 +msgid "Stage To Commit" +msgstr "Indexer" + +#: git-gui.sh:2649 +msgid "Stage Changed Files To Commit" +msgstr "Indexer toutes modifications" + +#: git-gui.sh:2655 +msgid "Unstage From Commit" +msgstr "Désindexer" + +#: git-gui.sh:2661 lib/index.tcl:412 +msgid "Revert Changes" +msgstr "Annuler les modifications" + +#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 +msgid "Show Less Context" +msgstr "Montrer moins de contexte" + +#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 +msgid "Show More Context" +msgstr "Montrer plus de contexte" + +#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 +msgid "Sign Off" +msgstr "Signer" + +#: git-gui.sh:2696 +msgid "Local Merge..." +msgstr "Fusion locale..." + +#: git-gui.sh:2701 +msgid "Abort Merge..." +msgstr "Abandonner fusion..." + +#: git-gui.sh:2713 git-gui.sh:2741 +msgid "Add..." +msgstr "Ajouter..." + +#: git-gui.sh:2717 +msgid "Push..." +msgstr "Pousser..." + +#: git-gui.sh:2721 +msgid "Delete Branch..." +msgstr "Supprimer branche..." + +#: git-gui.sh:2731 git-gui.sh:3292 +msgid "Options..." +msgstr "Options..." + +#: git-gui.sh:2742 +msgid "Remove..." +msgstr "Supprimer..." + +#: git-gui.sh:2751 lib/choose_repository.tcl:50 +msgid "Help" +msgstr "Aide" + +#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 +#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 +#, tcl-format +msgid "About %s" +msgstr "À propos de %s" + +#: git-gui.sh:2783 +msgid "Online Documentation" +msgstr "Documentation en ligne" + +#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 +msgid "Show SSH Key" +msgstr "Montrer la clé SSH" + +#: git-gui.sh:2893 +#, tcl-format +msgid "fatal: cannot stat path %s: No such file or directory" +msgstr "" +"erreur fatale : pas d'infos sur le chemin %s : Fichier ou répertoire " +"inexistant" + +#: git-gui.sh:2926 +msgid "Current Branch:" +msgstr "Branche courante :" + +#: git-gui.sh:2947 +msgid "Staged Changes (Will Commit)" +msgstr "Modifs. indexées (pour commit)" + +#: git-gui.sh:2967 +msgid "Unstaged Changes" +msgstr "Modifs. non indexées" + +#: git-gui.sh:3017 +msgid "Stage Changed" +msgstr "Indexer modifs." + +#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 +msgid "Push" +msgstr "Pousser" + +#: git-gui.sh:3071 +msgid "Initial Commit Message:" +msgstr "Message de commit initial :" + +#: git-gui.sh:3072 +msgid "Amended Commit Message:" +msgstr "Message de commit corrigé :" + +#: git-gui.sh:3073 +msgid "Amended Initial Commit Message:" +msgstr "Message de commit initial corrigé :" + +#: git-gui.sh:3074 +msgid "Amended Merge Commit Message:" +msgstr "Message de commit de fusion corrigé :" + +#: git-gui.sh:3075 +msgid "Merge Commit Message:" +msgstr "Message de commit de fusion :" + +#: git-gui.sh:3076 +msgid "Commit Message:" +msgstr "Message de commit :" + +#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 +msgid "Copy All" +msgstr "Copier tout" + +#: git-gui.sh:3149 lib/blame.tcl:104 +msgid "File:" +msgstr "Fichier :" + +#: git-gui.sh:3255 +msgid "Refresh" +msgstr "Rafraîchir" + +#: git-gui.sh:3276 +msgid "Decrease Font Size" +msgstr "Diminuer la police" + +#: git-gui.sh:3280 +msgid "Increase Font Size" +msgstr "Agrandir la police" + +#: git-gui.sh:3288 lib/blame.tcl:281 +msgid "Encoding" +msgstr "Codage des caractères" + +#: git-gui.sh:3299 +msgid "Apply/Reverse Hunk" +msgstr "Appliquer/Inverser section" + +#: git-gui.sh:3304 +msgid "Apply/Reverse Line" +msgstr "Appliquer/Inverser la ligne" + +#: git-gui.sh:3323 +msgid "Run Merge Tool" +msgstr "Lancer l'outil de fusion" + +#: git-gui.sh:3328 +msgid "Use Remote Version" +msgstr "Utiliser la version distante" + +#: git-gui.sh:3332 +msgid "Use Local Version" +msgstr "Utiliser la version locale" + +#: git-gui.sh:3336 +msgid "Revert To Base" +msgstr "Revenir à la version de base" + +#: git-gui.sh:3354 +msgid "Visualize These Changes In The Submodule" +msgstr "Voir les changments dans le sous-module" + +#: git-gui.sh:3358 +msgid "Visualize Current Branch History In The Submodule" +msgstr "Voir l'historique de la branche courante du sous-module" + +#: git-gui.sh:3362 +msgid "Visualize All Branch History In The Submodule" +msgstr "Voir l'historique de toutes les branches du sous-module" + +#: git-gui.sh:3367 +msgid "Start git gui In The Submodule" +msgstr "Démarrer git gui dans le sous-module" + +#: git-gui.sh:3389 +msgid "Unstage Hunk From Commit" +msgstr "Désindexer la section" + +#: git-gui.sh:3391 +msgid "Unstage Lines From Commit" +msgstr "Désindexer la ligne du commit" + +#: git-gui.sh:3393 +msgid "Unstage Line From Commit" +msgstr "Désindexer la ligne" + +#: git-gui.sh:3396 +msgid "Stage Hunk For Commit" +msgstr "Indexer la section" + +#: git-gui.sh:3398 +msgid "Stage Lines For Commit" +msgstr "Indexer les lignes" + +#: git-gui.sh:3400 +msgid "Stage Line For Commit" +msgstr "Indexer la ligne" + +#: git-gui.sh:3424 +msgid "Initializing..." +msgstr "Initialisation..." + +#: git-gui.sh:3541 +#, tcl-format +msgid "" +"Possible environment issues exist.\n" +"\n" +"The following environment variables are probably\n" +"going to be ignored by any Git subprocess run\n" +"by %s:\n" +"\n" +msgstr "" +"Des problèmes d'environnement sont possibles.\n" +"\n" +"Les variables d'environnement suivantes seront\n" +"probablement ignorées par tous les\n" +"sous-processus de Git lancés par %s\n" +"\n" + +#: git-gui.sh:3570 +msgid "" +"\n" +"This is due to a known issue with the\n" +"Tcl binary distributed by Cygwin." +msgstr "" +"\n" +"Ceci est dû à un problème connu avec\n" +"le binaire Tcl distribué par Cygwin." + +#: git-gui.sh:3575 +#, tcl-format +msgid "" +"\n" +"\n" +"A good replacement for %s\n" +"is placing values for the user.name and\n" +"user.email settings into your personal\n" +"~/.gitconfig file.\n" +msgstr "" +"\n" +"\n" +"Un bon remplacement pour %s\n" +"est de mettre les valeurs pour 'user.name' (nom\n" +"de l'utilisateur) et 'user.email' (addresse email\n" +"de l'utilisateur) dans votre fichier '~/.gitconfig'.\n" + +#: lib/about.tcl:26 +msgid "git-gui - a graphical user interface for Git." +msgstr "git-gui - une interface graphique utilisateur pour Git" + +#: lib/blame.tcl:72 +msgid "File Viewer" +msgstr "Visionneur de fichier" + +#: lib/blame.tcl:78 +msgid "Commit:" +msgstr "Commit :" + +#: lib/blame.tcl:271 +msgid "Copy Commit" +msgstr "Copier commit" + +#: lib/blame.tcl:275 +msgid "Find Text..." +msgstr "Chercher texte..." + +#: lib/blame.tcl:284 +msgid "Do Full Copy Detection" +msgstr "Lancer la détection approfondie des copies" + +#: lib/blame.tcl:288 +msgid "Show History Context" +msgstr "Montrer l'historique" + +#: lib/blame.tcl:291 +msgid "Blame Parent Commit" +msgstr "Blâmer le commit parent" + +#: lib/blame.tcl:450 +#, tcl-format +msgid "Reading %s..." +msgstr "Lecture de %s..." + +#: lib/blame.tcl:557 +msgid "Loading copy/move tracking annotations..." +msgstr "Chargement des annotations de suivi des copies/déplacements..." + +#: lib/blame.tcl:577 +msgid "lines annotated" +msgstr "lignes annotées" + +#: lib/blame.tcl:769 +msgid "Loading original location annotations..." +msgstr "Chargement des annotations d'emplacement original" + +#: lib/blame.tcl:772 +msgid "Annotation complete." +msgstr "Annotation terminée." + +#: lib/blame.tcl:802 +msgid "Busy" +msgstr "Occupé" + +#: lib/blame.tcl:803 +msgid "Annotation process is already running." +msgstr "Annotation en cours d'exécution." + +#: lib/blame.tcl:842 +msgid "Running thorough copy detection..." +msgstr "Recherche de copie approfondie en cours..." + +#: lib/blame.tcl:910 +msgid "Loading annotation..." +msgstr "Chargement des annotations..." + +#: lib/blame.tcl:963 +msgid "Author:" +msgstr "Auteur :" + +#: lib/blame.tcl:967 +msgid "Committer:" +msgstr "Commiteur :" + +#: lib/blame.tcl:972 +msgid "Original File:" +msgstr "Fichier original :" + +#: lib/blame.tcl:1020 +msgid "Cannot find HEAD commit:" +msgstr "Impossible de trouver le commit HEAD :" + +#: lib/blame.tcl:1075 +msgid "Cannot find parent commit:" +msgstr "Impossible de trouver le commit parent :" + +#: lib/blame.tcl:1090 +msgid "Unable to display parent" +msgstr "Impossible d'afficher le parent" + +#: lib/blame.tcl:1091 lib/diff.tcl:320 +msgid "Error loading diff:" +msgstr "Erreur lors du chargement des différences :" + +#: lib/blame.tcl:1231 +msgid "Originally By:" +msgstr "À l'origine par :" + +#: lib/blame.tcl:1237 +msgid "In File:" +msgstr "Dans le fichier :" + +#: lib/blame.tcl:1242 +msgid "Copied Or Moved Here By:" +msgstr "Copié ou déplacé ici par :" + +#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 +msgid "Checkout Branch" +msgstr "Charger la branche (checkout)" + +#: lib/branch_checkout.tcl:23 +msgid "Checkout" +msgstr "Charger (checkout)" + +#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 +#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 +#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 +#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 +#: lib/transport.tcl:108 +msgid "Cancel" +msgstr "Annuler" + +#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 +msgid "Revision" +msgstr "Révision" + +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 +msgid "Options" +msgstr "Options" + +#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 +msgid "Fetch Tracking Branch" +msgstr "Récupérer la branche de suivi" + +#: lib/branch_checkout.tcl:44 +msgid "Detach From Local Branch" +msgstr "Détacher de la branche locale" + +#: lib/branch_create.tcl:22 +msgid "Create Branch" +msgstr "Créer une branche" + +#: lib/branch_create.tcl:27 +msgid "Create New Branch" +msgstr "Créer une nouvelle branche" + +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 +msgid "Create" +msgstr "Créer" + +#: lib/branch_create.tcl:40 +msgid "Branch Name" +msgstr "Nom de branche" + +#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 +msgid "Name:" +msgstr "Nom :" + +#: lib/branch_create.tcl:58 +msgid "Match Tracking Branch Name" +msgstr "Trouver nom de branche de suivi" + +#: lib/branch_create.tcl:66 +msgid "Starting Revision" +msgstr "Révision initiale" + +#: lib/branch_create.tcl:72 +msgid "Update Existing Branch:" +msgstr "Mettre à jour une branche existante :" + +#: lib/branch_create.tcl:75 +msgid "No" +msgstr "Non" + +#: lib/branch_create.tcl:80 +msgid "Fast Forward Only" +msgstr "Mise à jour rectiligne seulement (fast-forward)" + +#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 +msgid "Reset" +msgstr "Réinitialiser" + +#: lib/branch_create.tcl:97 +msgid "Checkout After Creation" +msgstr "Charger (checkout) après création" + +#: lib/branch_create.tcl:131 +msgid "Please select a tracking branch." +msgstr "Choisissez une branche de suivi" + +#: lib/branch_create.tcl:140 +#, tcl-format +msgid "Tracking branch %s is not a branch in the remote repository." +msgstr "La branche de suivi %s n'est pas une branche dans le dépôt distant." + +#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 +msgid "Please supply a branch name." +msgstr "Fournissez un nom de branche." + +#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 +#, tcl-format +msgid "'%s' is not an acceptable branch name." +msgstr "'%s' n'est pas un nom de branche acceptable." + +#: lib/branch_delete.tcl:15 +msgid "Delete Branch" +msgstr "Supprimer branche" + +#: lib/branch_delete.tcl:20 +msgid "Delete Local Branch" +msgstr "Supprimer branche locale" + +#: lib/branch_delete.tcl:37 +msgid "Local Branches" +msgstr "Branches locales" + +#: lib/branch_delete.tcl:52 +msgid "Delete Only If Merged Into" +msgstr "Supprimer seulement si fusionnée dans :" + +#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 +msgid "Always (Do not perform merge checks)" +msgstr "Toujours (ne pas vérifier les fusions)" + +#: lib/branch_delete.tcl:103 +#, tcl-format +msgid "The following branches are not completely merged into %s:" +msgstr "Les branches suivantes ne sont pas complètement fusionnées dans %s :" + +#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 +msgid "" +"Recovering deleted branches is difficult.\n" +"\n" +"Delete the selected branches?" +msgstr "" +"Il est difficile de récupérer des branches supprimées.\n" +"\n" +"Supprimer les branches sélectionnées ?" + +#: lib/branch_delete.tcl:141 +#, tcl-format +msgid "" +"Failed to delete branches:\n" +"%s" +msgstr "" +"La suppression des branches suivantes a échoué :\n" +"%s" + +#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 +msgid "Rename Branch" +msgstr "Renommer branche" + +#: lib/branch_rename.tcl:26 +msgid "Rename" +msgstr "Renommer" + +#: lib/branch_rename.tcl:36 +msgid "Branch:" +msgstr "Branche :" + +#: lib/branch_rename.tcl:39 +msgid "New Name:" +msgstr "Nouveau nom :" + +#: lib/branch_rename.tcl:75 +msgid "Please select a branch to rename." +msgstr "Merci de sélectionner une branche à renommer." + +#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 +#, tcl-format +msgid "Branch '%s' already exists." +msgstr "La branche '%s' existe déjà." + +#: lib/branch_rename.tcl:117 +#, tcl-format +msgid "Failed to rename '%s'." +msgstr "Échec pour renommer '%s'." + +#: lib/browser.tcl:17 +msgid "Starting..." +msgstr "Lancement..." + +#: lib/browser.tcl:26 +msgid "File Browser" +msgstr "Visionneur de fichier" + +#: lib/browser.tcl:126 lib/browser.tcl:143 +#, tcl-format +msgid "Loading %s..." +msgstr "Chargement de %s..." + +#: lib/browser.tcl:187 +msgid "[Up To Parent]" +msgstr "[Jusqu'au parent]" + +#: lib/browser.tcl:267 lib/browser.tcl:273 +msgid "Browse Branch Files" +msgstr "Naviguer dans les fichiers de le branche" + +#: lib/browser.tcl:278 lib/choose_repository.tcl:398 +#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 +#: lib/choose_repository.tcl:1028 +msgid "Browse" +msgstr "Naviguer" + +#: lib/checkout_op.tcl:85 +#, tcl-format +msgid "Fetching %s from %s" +msgstr "Récupération de %s à partir de %s" + +#: lib/checkout_op.tcl:133 +#, tcl-format +msgid "fatal: Cannot resolve %s" +msgstr "erreur fatale : Impossible de résoudre %s" + +#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 +#: lib/sshkey.tcl:53 +msgid "Close" +msgstr "Fermer" + +#: lib/checkout_op.tcl:175 +#, tcl-format +msgid "Branch '%s' does not exist." +msgstr "La branche '%s' n'existe pas." + +#: lib/checkout_op.tcl:194 +#, tcl-format +msgid "Failed to configure simplified git-pull for '%s'." +msgstr "Échec de la configuration simplifiée de git-pull pour '%s'." + +#: lib/checkout_op.tcl:229 +#, tcl-format +msgid "" +"Branch '%s' already exists.\n" +"\n" +"It cannot fast-forward to %s.\n" +"A merge is required." +msgstr "" +"La branche '%s' existe déjà.\n" +"\n" +"Impossible de faire une avance rapide (fast forward) vers %s.\n" +"Une fusion est nécessaire." + +#: lib/checkout_op.tcl:243 +#, tcl-format +msgid "Merge strategy '%s' not supported." +msgstr "La stratégie de fusion '%s' n'est pas supportée." + +#: lib/checkout_op.tcl:262 +#, tcl-format +msgid "Failed to update '%s'." +msgstr "La mise à jour de '%s' a échoué." + +#: lib/checkout_op.tcl:274 +msgid "Staging area (index) is already locked." +msgstr "L'index (staging area) est déjà verrouillé." + +#: lib/checkout_op.tcl:289 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before the current branch can be changed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"L'état lors de la dernière synchronisation ne correspond plus à l'état du " +"dépôt.\n" +"\n" +"Un autre programme Git a modifié ce dépôt depuis la dernière " +"synchronisation. Une resynchronisation doit être effectuée avant de pouvoir " +"modifier la branche courante.\n" +"\n" +"Cela va être fait tout de suite automatiquement.\n" + +#: lib/checkout_op.tcl:345 +#, tcl-format +msgid "Updating working directory to '%s'..." +msgstr "Mise à jour du répertoire courant avec '%s'..." + +#: lib/checkout_op.tcl:346 +msgid "files checked out" +msgstr "fichiers chargés" + +#: lib/checkout_op.tcl:376 +#, tcl-format +msgid "Aborted checkout of '%s' (file level merging is required)." +msgstr "" +"Chargement de '%s' abandonné (il est nécessaire de fusionner des fichiers)." + +#: lib/checkout_op.tcl:377 +msgid "File level merge required." +msgstr "Il est nécessaire de fusionner des fichiers." + +#: lib/checkout_op.tcl:381 +#, tcl-format +msgid "Staying on branch '%s'." +msgstr "Le répertoire de travail reste sur la branche '%s'." + +#: lib/checkout_op.tcl:452 +msgid "" +"You are no longer on a local branch.\n" +"\n" +"If you wanted to be on a branch, create one now starting from 'This Detached " +"Checkout'." +msgstr "" +"Vous n'êtes plus sur une branche locale.\n" +"\n" +"Si vous vouliez être sur une branche, créez-en une maintenant en partant de " +"'Cet emprunt détaché'." + +#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 +#, tcl-format +msgid "Checked out '%s'." +msgstr "'%s' chargé." + +#: lib/checkout_op.tcl:535 +#, tcl-format +msgid "Resetting '%s' to '%s' will lose the following commits:" +msgstr "Réinitialiser '%s' à '%s' va faire perdre les commits suivants :" + +#: lib/checkout_op.tcl:557 +msgid "Recovering lost commits may not be easy." +msgstr "Récupérer les commits perdus ne sera peut être pas facile." + +#: lib/checkout_op.tcl:562 +#, tcl-format +msgid "Reset '%s'?" +msgstr "Réinitialiser '%s' ?" + +#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 +msgid "Visualize" +msgstr "Visualiser" + +#: lib/checkout_op.tcl:635 +#, tcl-format +msgid "" +"Failed to set current branch.\n" +"\n" +"This working directory is only partially switched. We successfully updated " +"your files, but failed to update an internal Git file.\n" +"\n" +"This should not have occurred. %s will now close and give up." +msgstr "" +"Le changement de la branche courante a échoué.\n" +"\n" +"Le répertoire courant n'est que partiellement modifié. Les fichiers ont été " +"mis à jour avec succès, mais la mise à jour d'un fichier interne à Git a " +"échouée.\n" +"\n" +"Cela n'aurait pas dû se produire. %s va abandonner et se terminer." + +#: lib/choose_font.tcl:39 +msgid "Select" +msgstr "Sélectionner" + +#: lib/choose_font.tcl:53 +msgid "Font Family" +msgstr "Familles de polices" + +#: lib/choose_font.tcl:74 +msgid "Font Size" +msgstr "Taille de police" + +#: lib/choose_font.tcl:91 +msgid "Font Example" +msgstr "Exemple de police" + +#: lib/choose_font.tcl:103 +msgid "" +"This is example text.\n" +"If you like this text, it can be your font." +msgstr "" +"Ceci est un texte d'exemple.\n" +"Si vous aimez ce texte, vous pouvez choisir cette police." + +#: lib/choose_repository.tcl:28 +msgid "Git Gui" +msgstr "Git Gui" + +#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 +msgid "Create New Repository" +msgstr "Créer nouveau dépôt" + +#: lib/choose_repository.tcl:93 +msgid "New..." +msgstr "Nouveau..." + +#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 +msgid "Clone Existing Repository" +msgstr "Cloner un dépôt existant" + +#: lib/choose_repository.tcl:106 +msgid "Clone..." +msgstr "Cloner..." + +#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 +msgid "Open Existing Repository" +msgstr "Ouvrir un dépôt existant" + +#: lib/choose_repository.tcl:119 +msgid "Open..." +msgstr "Ouvrir..." + +#: lib/choose_repository.tcl:132 +msgid "Recent Repositories" +msgstr "Dépôts récemment utilisés" + +#: lib/choose_repository.tcl:138 +msgid "Open Recent Repository:" +msgstr "Ouvrir un dépôt récent :" + +#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 +#: lib/choose_repository.tcl:320 +#, tcl-format +msgid "Failed to create repository %s:" +msgstr "La création du dépôt %s a échoué :" + +#: lib/choose_repository.tcl:391 +msgid "Directory:" +msgstr "Répertoire :" + +#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 +#: lib/choose_repository.tcl:1052 +msgid "Git Repository" +msgstr "Dépôt Git" + +#: lib/choose_repository.tcl:448 +#, tcl-format +msgid "Directory %s already exists." +msgstr "Le répertoire %s existe déjà." + +#: lib/choose_repository.tcl:452 +#, tcl-format +msgid "File %s already exists." +msgstr "Le fichier %s existe déjà." + +#: lib/choose_repository.tcl:466 +msgid "Clone" +msgstr "Cloner" + +#: lib/choose_repository.tcl:479 +msgid "Source Location:" +msgstr "Emplacement source :" + +#: lib/choose_repository.tcl:490 +msgid "Target Directory:" +msgstr "Répertoire cible :" + +#: lib/choose_repository.tcl:502 +msgid "Clone Type:" +msgstr "Type de clonage :" + +#: lib/choose_repository.tcl:508 +msgid "Standard (Fast, Semi-Redundant, Hardlinks)" +msgstr "Standard (rapide, semi-redondant, liens durs)" + +#: lib/choose_repository.tcl:514 +msgid "Full Copy (Slower, Redundant Backup)" +msgstr "Copie complète (plus lent, sauvegarde redondante)" + +#: lib/choose_repository.tcl:520 +msgid "Shared (Fastest, Not Recommended, No Backup)" +msgstr "Partagé (le plus rapide, non recommandé, pas de sauvegarde)" + +#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 +#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 +#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 +#, tcl-format +msgid "Not a Git repository: %s" +msgstr "'%s' n'est pas un dépôt Git." + +#: lib/choose_repository.tcl:592 +msgid "Standard only available for local repository." +msgstr "Standard n'est disponible que pour un dépôt local." + +#: lib/choose_repository.tcl:596 +msgid "Shared only available for local repository." +msgstr "Partagé n'est disponible que pour un dépôt local." + +#: lib/choose_repository.tcl:617 +#, tcl-format +msgid "Location %s already exists." +msgstr "L'emplacement %s existe déjà." + +#: lib/choose_repository.tcl:628 +msgid "Failed to configure origin" +msgstr "La configuration de l'origine a échoué." + +#: lib/choose_repository.tcl:640 +msgid "Counting objects" +msgstr "Décompte des objets" + +#: lib/choose_repository.tcl:641 +msgid "buckets" +msgstr "paniers" + +#: lib/choose_repository.tcl:665 +#, tcl-format +msgid "Unable to copy objects/info/alternates: %s" +msgstr "Impossible de copier 'objects/info/alternates' : %s" + +#: lib/choose_repository.tcl:701 +#, tcl-format +msgid "Nothing to clone from %s." +msgstr "Il n'y a rien à cloner depuis %s." + +#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 +#: lib/choose_repository.tcl:929 +msgid "The 'master' branch has not been initialized." +msgstr "La branche 'master' n'a pas été initialisée." + +#: lib/choose_repository.tcl:716 +msgid "Hardlinks are unavailable. Falling back to copying." +msgstr "" +"Les liens durs ne sont pas supportés. Une copie sera effectuée à la place." + +#: lib/choose_repository.tcl:728 +#, tcl-format +msgid "Cloning from %s" +msgstr "Clonage depuis %s" + +#: lib/choose_repository.tcl:759 +msgid "Copying objects" +msgstr "Copie des objets" + +#: lib/choose_repository.tcl:760 +msgid "KiB" +msgstr "KiB" + +#: lib/choose_repository.tcl:784 +#, tcl-format +msgid "Unable to copy object: %s" +msgstr "Impossible de copier l'objet : %s" + +#: lib/choose_repository.tcl:794 +msgid "Linking objects" +msgstr "Liaison des objets" + +#: lib/choose_repository.tcl:795 +msgid "objects" +msgstr "objets" + +#: lib/choose_repository.tcl:803 +#, tcl-format +msgid "Unable to hardlink object: %s" +msgstr "Impossible créer un lien dur pour l'objet : %s" + +#: lib/choose_repository.tcl:858 +msgid "Cannot fetch branches and objects. See console output for details." +msgstr "" +"Impossible de récupérer les branches et objets. Voir la sortie console pour " +"plus de détails." + +#: lib/choose_repository.tcl:869 +msgid "Cannot fetch tags. See console output for details." +msgstr "" +"Impossible de récupérer les marques (tags). Voir la sortie console pour plus " +"de détails." + +#: lib/choose_repository.tcl:893 +msgid "Cannot determine HEAD. See console output for details." +msgstr "" +"Impossible de déterminer HEAD. Voir la sortie console pour plus de détails." + +#: lib/choose_repository.tcl:902 +#, tcl-format +msgid "Unable to cleanup %s" +msgstr "Impossible de nettoyer %s" + +#: lib/choose_repository.tcl:908 +msgid "Clone failed." +msgstr "Le clonage a échoué." + +#: lib/choose_repository.tcl:915 +msgid "No default branch obtained." +msgstr "Aucune branche par défaut n'a été obtenue." + +#: lib/choose_repository.tcl:926 +#, tcl-format +msgid "Cannot resolve %s as a commit." +msgstr "Impossible de résoudre %s comme commit." + +#: lib/choose_repository.tcl:938 +msgid "Creating working directory" +msgstr "Création du répertoire de travail" + +#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 +#: lib/index.tcl:198 +msgid "files" +msgstr "fichiers" + +#: lib/choose_repository.tcl:968 +msgid "Initial file checkout failed." +msgstr "Le chargement initial du fichier a échoué." + +#: lib/choose_repository.tcl:1011 +msgid "Open" +msgstr "Ouvrir" + +#: lib/choose_repository.tcl:1021 +msgid "Repository:" +msgstr "Dépôt :" + +#: lib/choose_repository.tcl:1072 +#, tcl-format +msgid "Failed to open repository %s:" +msgstr "Impossible d'ouvrir le dépôt %s :" + +#: lib/choose_rev.tcl:53 +msgid "This Detached Checkout" +msgstr "Cet emprunt détaché" + +#: lib/choose_rev.tcl:60 +msgid "Revision Expression:" +msgstr "Expression de révision :" + +#: lib/choose_rev.tcl:74 +msgid "Local Branch" +msgstr "Branche locale" + +#: lib/choose_rev.tcl:79 +msgid "Tracking Branch" +msgstr "Branche de suivi" + +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 +msgid "Tag" +msgstr "Marque (tag)" + +#: lib/choose_rev.tcl:317 +#, tcl-format +msgid "Invalid revision: %s" +msgstr "Révision invalide : %s" + +#: lib/choose_rev.tcl:338 +msgid "No revision selected." +msgstr "Pas de révision sélectionnée." + +#: lib/choose_rev.tcl:346 +msgid "Revision expression is empty." +msgstr "L'expression de révision est vide." + +#: lib/choose_rev.tcl:531 +msgid "Updated" +msgstr "Mise à jour:" + +#: lib/choose_rev.tcl:559 +msgid "URL" +msgstr "URL" + +#: lib/commit.tcl:9 +msgid "" +"There is nothing to amend.\n" +"\n" +"You are about to create the initial commit. There is no commit before this " +"to amend.\n" +msgstr "" +"Il n'y a rien à corriger.\n" +"\n" +"Vous allez créer le commit initial. Il n'y a pas de commit avant celui-ci à " +"corriger.\n" + +#: lib/commit.tcl:18 +msgid "" +"Cannot amend while merging.\n" +"\n" +"You are currently in the middle of a merge that has not been fully " +"completed. You cannot amend the prior commit unless you first abort the " +"current merge activity.\n" +msgstr "" +"Impossible de corriger pendant une fusion.\n" +"\n" +"Vous êtes actuellement au milieu d'une fusion qui n'a pas été complètement " +"terminée. Vous ne pouvez pas corriger le commit précédent sauf si vous " +"abandonnez la fusion courante.\n" + +#: lib/commit.tcl:48 +msgid "Error loading commit data for amend:" +msgstr "Erreur lors du chargement des données de commit pour correction :" + +#: lib/commit.tcl:75 +msgid "Unable to obtain your identity:" +msgstr "Impossible d'obtenir votre identité :" + +#: lib/commit.tcl:80 +msgid "Invalid GIT_COMMITTER_IDENT:" +msgstr "GIT_COMMITTER_IDENT invalide :" + +#: lib/commit.tcl:129 +#, tcl-format +msgid "warning: Tcl does not support encoding '%s'." +msgstr "attention : Tcl ne supporte pas le codage '%s'." + +#: lib/commit.tcl:149 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before another commit can be created.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"L'état lors de la dernière synchronisation ne correspond plus à l'état du " +"dépôt.\n" +"\n" +"Un autre programme Git a modifié ce dépôt depuis la dernière " +"synchronisation. Une resynshronisation doit être effectuée avant de pouvoir " +"créer un nouveau commit.\n" +"\n" +"Cela va être fait tout de suite automatiquement.\n" + +#: lib/commit.tcl:172 +#, tcl-format +msgid "" +"Unmerged files cannot be committed.\n" +"\n" +"File %s has merge conflicts. You must resolve them and stage the file " +"before committing.\n" +msgstr "" +"Des fichiers non fusionnés ne peuvent être commités.\n" +"\n" +"Le fichier %s a des conflicts de fusion. Vous devez les résoudre et pré-" +"commiter le fichier avant de pouvoir commiter.\n" + +#: lib/commit.tcl:180 +#, tcl-format +msgid "" +"Unknown file state %s detected.\n" +"\n" +"File %s cannot be committed by this program.\n" +msgstr "" +"Un état de fichier inconnu %s a été détecté.\n" +"\n" +"Le fichier %s ne peut pas être commité par ce programme.\n" + +#: lib/commit.tcl:188 +msgid "" +"No changes to commit.\n" +"\n" +"You must stage at least 1 file before you can commit.\n" +msgstr "" +"Pas de modification à commiter.\n" +"\n" +"Vous devez indexer au moins 1 fichier avant de pouvoir commiter.\n" + +#: lib/commit.tcl:203 +msgid "" +"Please supply a commit message.\n" +"\n" +"A good commit message has the following format:\n" +"\n" +"- First line: Describe in one sentence what you did.\n" +"- Second line: Blank\n" +"- Remaining lines: Describe why this change is good.\n" +msgstr "" +"Merci de fournir un message de commit.\n" +"\n" +"Un bon message de commit a le format suivant :\n" +"\n" +"- Première ligne : décrire en une phrase ce que vous avez fait.\n" +"- Deuxième ligne : rien.\n" +"- Lignes suivantes : Décrire pourquoi ces modifications sont bonnes.\n" + +#: lib/commit.tcl:234 +msgid "Calling pre-commit hook..." +msgstr "Lancement de l'action d'avant-commit..." + +#: lib/commit.tcl:249 +msgid "Commit declined by pre-commit hook." +msgstr "Commit refusé par l'action d'avant-commit." + +#: lib/commit.tcl:272 +msgid "Calling commit-msg hook..." +msgstr "Lancement de l'action \"message de commit\"..." + +#: lib/commit.tcl:287 +msgid "Commit declined by commit-msg hook." +msgstr "Commit refusé par l'action \"message de commit\"." + +#: lib/commit.tcl:300 +msgid "Committing changes..." +msgstr "Commit des modifications..." + +#: lib/commit.tcl:316 +msgid "write-tree failed:" +msgstr "write-tree a échoué :" + +#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 +msgid "Commit failed." +msgstr "Le commit a échoué." + +#: lib/commit.tcl:334 +#, tcl-format +msgid "Commit %s appears to be corrupt" +msgstr "Le commit %s semble être corrompu" + +#: lib/commit.tcl:339 +msgid "" +"No changes to commit.\n" +"\n" +"No files were modified by this commit and it was not a merge commit.\n" +"\n" +"A rescan will be automatically started now.\n" +msgstr "" +"Pas de modification à commiter.\n" +"\n" +"Aucun fichier n'a été modifié par ce commit et il ne s'agit pas d'un commit " +"de fusion.\n" +"\n" +"Une resynchronisation va être lancée tout de suite automatiquement.\n" + +#: lib/commit.tcl:346 +msgid "No changes to commit." +msgstr "Pas de modifications à commiter." + +#: lib/commit.tcl:360 +msgid "commit-tree failed:" +msgstr "commit-tree a échoué :" + +#: lib/commit.tcl:381 +msgid "update-ref failed:" +msgstr "update-ref a échoué :" + +#: lib/commit.tcl:469 +#, tcl-format +msgid "Created commit %s: %s" +msgstr "Commit %s créé : %s" + +#: lib/console.tcl:59 +msgid "Working... please wait..." +msgstr "Travail en cours... merci de patienter..." + +#: lib/console.tcl:186 +msgid "Success" +msgstr "Succès" + +#: lib/console.tcl:200 +msgid "Error: Command Failed" +msgstr "Erreur : échec de la commande" + +#: lib/database.tcl:43 +msgid "Number of loose objects" +msgstr "Nombre d'objets en fichier particulier" + +#: lib/database.tcl:44 +msgid "Disk space used by loose objects" +msgstr "Espace disque utilisé par les fichiers particuliers" + +#: lib/database.tcl:45 +msgid "Number of packed objects" +msgstr "Nombre d'objets empaquetés" + +#: lib/database.tcl:46 +msgid "Number of packs" +msgstr "Nombre de paquets d'objets" + +#: lib/database.tcl:47 +msgid "Disk space used by packed objects" +msgstr "Espace disque utilisé par les objets empaquetés" + +#: lib/database.tcl:48 +msgid "Packed objects waiting for pruning" +msgstr "Objets empaquetés attendant d'être supprimés" + +#: lib/database.tcl:49 +msgid "Garbage files" +msgstr "Fichiers poubelle" + +#: lib/database.tcl:72 +msgid "Compressing the object database" +msgstr "Compression de la base des objets" + +#: lib/database.tcl:83 +msgid "Verifying the object database with fsck-objects" +msgstr "Vérification de la base des objets avec fsck-objects" + +#: lib/database.tcl:107 +#, tcl-format +msgid "" +"This repository currently has approximately %i loose objects.\n" +"\n" +"To maintain optimal performance it is strongly recommended that you compress " +"the database.\n" +"\n" +"Compress the database now?" +msgstr "" +"Ce dépôt comprend actuellement environ %i objets ayant leur fichier " +"particulier.\n" +"\n" +"Pour conserver une performance optimale, il est fortement recommandé de " +"comprimer la base de donnée.\n" +"\n" +"Comprimer la base maintenant ?" + +#: lib/date.tcl:25 +#, tcl-format +msgid "Invalid date from Git: %s" +msgstr "Date invalide de Git : %s" + +#: lib/diff.tcl:64 +#, tcl-format +msgid "" +"No differences detected.\n" +"\n" +"%s has no changes.\n" +"\n" +"The modification date of this file was updated by another application, but " +"the content within the file was not changed.\n" +"\n" +"A rescan will be automatically started to find other files which may have " +"the same state." +msgstr "" +"Aucune différence détectée.\n" +"\n" +"%s ne comporte aucune modification.\n" +"\n" +"La date de modification de ce fichier a été mise à jour par une autre " +"application, mais le contenu du fichier n'a pas changé.\n" +"\n" +"Une resynchronisation va être lancée automatiquement pour trouver d'autres " +"fichiers qui pourraient se trouver dans le même état." + +#: lib/diff.tcl:104 +#, tcl-format +msgid "Loading diff of %s..." +msgstr "Chargement des différences de %s..." + +#: lib/diff.tcl:125 +msgid "" +"LOCAL: deleted\n" +"REMOTE:\n" +msgstr "" +"LOCAL : supprimé\n" +"DISTANT :\n" + +#: lib/diff.tcl:130 +msgid "" +"REMOTE: deleted\n" +"LOCAL:\n" +msgstr "" +"DISTANT : supprimé\n" +"LOCAL :\n" + +#: lib/diff.tcl:137 +msgid "LOCAL:\n" +msgstr "LOCAL :\n" + +#: lib/diff.tcl:140 +msgid "REMOTE:\n" +msgstr "DISTANT :\n" + +#: lib/diff.tcl:202 lib/diff.tcl:319 +#, tcl-format +msgid "Unable to display %s" +msgstr "Impossible d'afficher %s" + +#: lib/diff.tcl:203 +msgid "Error loading file:" +msgstr "Erreur lors du chargement du fichier :" + +#: lib/diff.tcl:210 +msgid "Git Repository (subproject)" +msgstr "Dépôt Git (sous projet)" + +#: lib/diff.tcl:222 +msgid "* Binary file (not showing content)." - msgstr "* Fichier binaire (pas d'apperçu du contenu)." ++msgstr "* Fichier binaire (pas d'aperçu du contenu)." + +#: lib/diff.tcl:227 +#, tcl-format +msgid "" +"* Untracked file is %d bytes.\n" +"* Showing only first %d bytes.\n" +msgstr "" +"* Le fichier non suivi fait %d octets.\n" +"* Seuls les %d premiers octets sont montrés.\n" + +#: lib/diff.tcl:233 +#, tcl-format +msgid "" +"\n" +"* Untracked file clipped here by %s.\n" +"* To see the entire file, use an external editor.\n" +msgstr "" +"\n" +"* Fichier suivi raccourcis ici de %s.\n" +"* Pour voir le fichier entier, utilisez un éditeur externe.\n" + +#: lib/diff.tcl:482 +msgid "Failed to unstage selected hunk." +msgstr "Échec lors de la désindexation de la section sélectionnée." + +#: lib/diff.tcl:489 +msgid "Failed to stage selected hunk." +msgstr "Échec lors de l'indexation de la section." + +#: lib/diff.tcl:568 +msgid "Failed to unstage selected line." +msgstr "Échec lors de la désindexation de la ligne sélectionnée." + +#: lib/diff.tcl:576 +msgid "Failed to stage selected line." +msgstr "Échec lors de l'indexation de la ligne." + +#: lib/encoding.tcl:443 +msgid "Default" +msgstr "Défaut" + +#: lib/encoding.tcl:448 +#, tcl-format +msgid "System (%s)" +msgstr "Système (%s)" + +#: lib/encoding.tcl:459 lib/encoding.tcl:465 +msgid "Other" +msgstr "Autre" + +#: lib/error.tcl:20 lib/error.tcl:114 +msgid "error" +msgstr "erreur" + +#: lib/error.tcl:36 +msgid "warning" +msgstr "attention" + +#: lib/error.tcl:94 +msgid "You must correct the above errors before committing." +msgstr "Vous devez corriger les erreurs suivantes avant de pouvoir commiter." + +#: lib/index.tcl:6 +msgid "Unable to unlock the index." +msgstr "Impossible de déverrouiller l'index." + +#: lib/index.tcl:15 +msgid "Index Error" +msgstr "Erreur de l'index" + +#: lib/index.tcl:17 +msgid "" +"Updating the Git index failed. A rescan will be automatically started to " +"resynchronize git-gui." +msgstr "" +"Échec de la mise à jour de l'index. Une resynchronisation va être lancée " +"automatiquement." + +#: lib/index.tcl:28 +msgid "Continue" +msgstr "Continuer" + +#: lib/index.tcl:31 +msgid "Unlock Index" +msgstr "Déverrouiller l'index" + +#: lib/index.tcl:289 +#, tcl-format +msgid "Unstaging %s from commit" +msgstr "Désindexation de : %s" + +#: lib/index.tcl:328 +msgid "Ready to commit." +msgstr "Prêt à être commité." + +#: lib/index.tcl:341 +#, tcl-format +msgid "Adding %s" +msgstr "Ajout de %s" + +#: lib/index.tcl:398 +#, tcl-format +msgid "Revert changes in file %s?" +msgstr "Annuler les modifications dans le fichier %s ? " + +#: lib/index.tcl:400 +#, tcl-format +msgid "Revert changes in these %i files?" +msgstr "Annuler les modifications dans ces %i fichiers ?" + +#: lib/index.tcl:408 +msgid "Any unstaged changes will be permanently lost by the revert." +msgstr "" +"Toutes les modifications non-indexées seront définitivement perdues par " +"l'annulation." + +#: lib/index.tcl:411 +msgid "Do Nothing" +msgstr "Ne rien faire" + +#: lib/index.tcl:429 +msgid "Reverting selected files" +msgstr "Annuler modifications dans fichiers selectionnés" + +#: lib/index.tcl:433 +#, tcl-format +msgid "Reverting %s" +msgstr "Annulation des modifications dans %s" + +#: lib/merge.tcl:13 +msgid "" +"Cannot merge while amending.\n" +"\n" +"You must finish amending this commit before starting any type of merge.\n" +msgstr "" +"Impossible de fusionner pendant une correction.\n" +"\n" +"Vous devez finir de corriger ce commit avant de lancer une quelconque " +"fusion.\n" + +#: lib/merge.tcl:27 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before a merge can be performed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"L'état lors de la dernière synchronisation ne correspond plus à l'état du " +"dépôt.\n" +"\n" +"Un autre programme Git a modifié ce dépôt depuis la dernière " +"synchronisation. Une resynchronisation doit être effectuée avant de pouvoir " +"fusionner de nouveau.\n" +"\n" +"Cela va être fait tout de suite automatiquement\n" + +#: lib/merge.tcl:45 +#, tcl-format +msgid "" +"You are in the middle of a conflicted merge.\n" +"\n" +"File %s has merge conflicts.\n" +"\n" +"You must resolve them, stage the file, and commit to complete the current " +"merge. Only then can you begin another merge.\n" +msgstr "" +"Vous êtes au milieu d'une fusion conflictuelle.\n" +"\n" +"Le fichier %s a des conflicts de fusion.\n" +"\n" +"Vous devez les résoudre, puis indexer le fichier, et enfin commiter pour " +"terminer la fusion courante. Seulement à ce moment là sera-t-il possible " +"d'effectuer une nouvelle fusion.\n" + +#: lib/merge.tcl:55 +#, tcl-format +msgid "" +"You are in the middle of a change.\n" +"\n" +"File %s is modified.\n" +"\n" +"You should complete the current commit before starting a merge. Doing so " +"will help you abort a failed merge, should the need arise.\n" +msgstr "" +"Vous êtes au milieu d'une modification.\n" +"\n" +"Le fichier %s a été modifié.\n" +"\n" +"Vous devriez terminer le commit courant avant de lancer une fusion. En " +"faisait comme cela, vous éviterez de devoir éventuellement abandonner une " +"fusion ayant échoué.\n" + +#: lib/merge.tcl:107 +#, tcl-format +msgid "%s of %s" +msgstr "%s de %s" + +#: lib/merge.tcl:120 +#, tcl-format +msgid "Merging %s and %s..." +msgstr "Fusion de %s et %s..." + +#: lib/merge.tcl:131 +msgid "Merge completed successfully." +msgstr "La fusion s'est faite avec succès." + +#: lib/merge.tcl:133 +msgid "Merge failed. Conflict resolution is required." +msgstr "La fusion a echoué. Il est nécessaire de résoudre les conflits." + +#: lib/merge.tcl:158 +#, tcl-format +msgid "Merge Into %s" +msgstr "Fusion dans %s" + +#: lib/merge.tcl:177 +msgid "Revision To Merge" +msgstr "Révision à fusionner" + +#: lib/merge.tcl:212 +msgid "" +"Cannot abort while amending.\n" +"\n" +"You must finish amending this commit.\n" +msgstr "" +"Impossible d'abandonner en cours de correction.\n" +"\n" +"Vous devez finir de corriger ce commit.\n" + +#: lib/merge.tcl:222 +msgid "" +"Abort merge?\n" +"\n" +"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with aborting the current merge?" +msgstr "" +"Abandonner la fusion ?\n" +"\n" +"Abandonner la fusion courante entrainera la perte de TOUTES les " +"modifications non commitées.\n" +"\n" +"Abandonner quand même la fusion courante ?" + +#: lib/merge.tcl:228 +msgid "" +"Reset changes?\n" +"\n" +"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with resetting the current changes?" +msgstr "" +"Réinitialiser les modifications ?\n" +"\n" +"Réinitialiser les modifications va faire perdre TOUTES les modifications non " +"commitées.\n" +"\n" +"Réinitialiser quand même les modifications courantes ?" + +#: lib/merge.tcl:239 +msgid "Aborting" +msgstr "Abandon" + +#: lib/merge.tcl:239 +msgid "files reset" +msgstr "fichiers réinitialisés" + +#: lib/merge.tcl:267 +msgid "Abort failed." +msgstr "L'abandon a échoué." + +#: lib/merge.tcl:269 +msgid "Abort completed. Ready." +msgstr "Abandon teminé. Prêt." + +#: lib/mergetool.tcl:8 +msgid "Force resolution to the base version?" +msgstr "Forcer la résolution à la version de base ?" + +#: lib/mergetool.tcl:9 +msgid "Force resolution to this branch?" +msgstr "Forcer la résolution à cette branche ?" + +#: lib/mergetool.tcl:10 +msgid "Force resolution to the other branch?" +msgstr "Forcer la résolution à l'autre branche ?" + +#: lib/mergetool.tcl:14 +#, tcl-format +msgid "" +"Note that the diff shows only conflicting changes.\n" +"\n" +"%s will be overwritten.\n" +"\n" +"This operation can be undone only by restarting the merge." +msgstr "" +"Noter que le diff ne montre que les modifications en conflit.\n" +"\n" +"%s sera écrasé.\n" +"\n" +"Cette opération ne peut être inversée qu'en relançant la fusion." + +#: lib/mergetool.tcl:45 +#, tcl-format +msgid "File %s seems to have unresolved conflicts, still stage?" +msgstr "" +"Le fichier %s semble avoir des conflits non résolus, indexer quand même ?" + +#: lib/mergetool.tcl:60 +#, tcl-format +msgid "Adding resolution for %s" +msgstr "Ajouter une résolution pour %s" + +#: lib/mergetool.tcl:141 +msgid "Cannot resolve deletion or link conflicts using a tool" +msgstr "" +"Impossible de résoudre la suppression ou de relier des conflits en utilisant " +"un outil" + +#: lib/mergetool.tcl:146 +msgid "Conflict file does not exist" +msgstr "Le fichier en conflit n'existe pas." + +#: lib/mergetool.tcl:264 +#, tcl-format +msgid "Not a GUI merge tool: '%s'" +msgstr "'%s' n'est pas un outil graphique pour fusionner des fichiers." + +#: lib/mergetool.tcl:268 +#, tcl-format +msgid "Unsupported merge tool '%s'" +msgstr "Outil de fusion '%s' non supporté" + +#: lib/mergetool.tcl:303 +msgid "Merge tool is already running, terminate it?" +msgstr "L'outil de fusion tourne déjà, faut-il le terminer ?" + +#: lib/mergetool.tcl:323 +#, tcl-format +msgid "" +"Error retrieving versions:\n" +"%s" +msgstr "" +"Erreur lors de la récupération des versions :\n" +"%s" + +#: lib/mergetool.tcl:343 +#, tcl-format +msgid "" +"Could not start the merge tool:\n" +"\n" +"%s" +msgstr "" +"Impossible de lancer l'outil de fusion :\n" +"\n" +"%s" + +#: lib/mergetool.tcl:347 +msgid "Running merge tool..." +msgstr "Lancement de l'outil de fusion..." + +#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 +msgid "Merge tool failed." +msgstr "L'outil de fusion a échoué." + +#: lib/option.tcl:11 +#, tcl-format +msgid "Invalid global encoding '%s'" +msgstr "Codage global '%s' invalide" + +#: lib/option.tcl:19 +#, tcl-format +msgid "Invalid repo encoding '%s'" +msgstr "Codage de dépôt '%s' invalide" + +#: lib/option.tcl:117 +msgid "Restore Defaults" +msgstr "Remettre les valeurs par défaut" + +#: lib/option.tcl:121 +msgid "Save" +msgstr "Sauvegarder" + +#: lib/option.tcl:131 +#, tcl-format +msgid "%s Repository" +msgstr "Dépôt : %s" + +#: lib/option.tcl:132 +msgid "Global (All Repositories)" +msgstr "Globales (tous les dépôts)" + +#: lib/option.tcl:138 +msgid "User Name" +msgstr "Nom d'utilisateur" + +#: lib/option.tcl:139 +msgid "Email Address" +msgstr "Adresse email" + +#: lib/option.tcl:141 +msgid "Summarize Merge Commits" +msgstr "Résumer les commits de fusion" + +#: lib/option.tcl:142 +msgid "Merge Verbosity" +msgstr "Fusion bavarde" + +#: lib/option.tcl:143 +msgid "Show Diffstat After Merge" +msgstr "Montrer statistiques de diff après fusion" + +#: lib/option.tcl:144 +msgid "Use Merge Tool" +msgstr "Utiliser outil de fusion" + +#: lib/option.tcl:146 +msgid "Trust File Modification Timestamps" +msgstr "Faire confiance aux dates de modification de fichiers " + +#: lib/option.tcl:147 +msgid "Prune Tracking Branches During Fetch" +msgstr "Purger les branches de suivi pendant la récupération" + +#: lib/option.tcl:148 +msgid "Match Tracking Branches" +msgstr "Faire correspondre les branches de suivi" + +#: lib/option.tcl:149 +msgid "Blame Copy Only On Changed Files" +msgstr "Annoter les copies seulement sur fichiers modifiés" + +#: lib/option.tcl:150 +msgid "Minimum Letters To Blame Copy On" +msgstr "Minimum de caratères pour annoter une copie" + +#: lib/option.tcl:151 +msgid "Blame History Context Radius (days)" +msgstr "Distance de blâme dans l'historique (jours)" + +#: lib/option.tcl:152 +msgid "Number of Diff Context Lines" +msgstr "Nombre de lignes de contexte dans les diffs" + +#: lib/option.tcl:153 +msgid "Commit Message Text Width" +msgstr "Largeur du texte de message de commit" + +#: lib/option.tcl:154 +msgid "New Branch Name Template" +msgstr "Nouveau modèle de nom de branche" + +#: lib/option.tcl:155 +msgid "Default File Contents Encoding" +msgstr "Codage du contenu des fichiers par défaut" + +#: lib/option.tcl:203 +msgid "Change" +msgstr "Modifier" + +#: lib/option.tcl:230 +msgid "Spelling Dictionary:" +msgstr "Dictionnaire d'orthographe :" + +#: lib/option.tcl:254 +msgid "Change Font" +msgstr "Modifier les polices" + +#: lib/option.tcl:258 +#, tcl-format +msgid "Choose %s" +msgstr "Choisir %s" + +#: lib/option.tcl:264 +msgid "pt." +msgstr "pt." + +#: lib/option.tcl:278 +msgid "Preferences" +msgstr "Préférences" + +#: lib/option.tcl:314 +msgid "Failed to completely save options:" +msgstr "La sauvegarde complète des options a échoué :" + +#: lib/remote.tcl:163 +msgid "Remove Remote" +msgstr "Supprimer un dépôt distant" + +#: lib/remote.tcl:168 +msgid "Prune from" +msgstr "Purger de" + +#: lib/remote.tcl:173 +msgid "Fetch from" +msgstr "Récupérer de" + +#: lib/remote.tcl:215 +msgid "Push to" +msgstr "Pousser vers" + +#: lib/remote_add.tcl:19 +msgid "Add Remote" +msgstr "Ajouter un dépôt distant" + +#: lib/remote_add.tcl:24 +msgid "Add New Remote" +msgstr "Ajouter un nouveau dépôt distant" + +#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 +msgid "Add" +msgstr "Ajouter" + +#: lib/remote_add.tcl:37 +msgid "Remote Details" +msgstr "Détails des dépôts distants" + +#: lib/remote_add.tcl:50 +msgid "Location:" +msgstr "Emplacement :" + +#: lib/remote_add.tcl:62 +msgid "Further Action" +msgstr "Action supplémentaire" + +#: lib/remote_add.tcl:65 +msgid "Fetch Immediately" +msgstr "Récupérer immédiatement" + +#: lib/remote_add.tcl:71 +msgid "Initialize Remote Repository and Push" +msgstr "Initialiser un dépôt distant et pousser" + +#: lib/remote_add.tcl:77 +msgid "Do Nothing Else Now" +msgstr "Ne rien faire d'autre maintenant" + +#: lib/remote_add.tcl:101 +msgid "Please supply a remote name." +msgstr "Merci de fournir un nom de dépôt distant." + +#: lib/remote_add.tcl:114 +#, tcl-format +msgid "'%s' is not an acceptable remote name." +msgstr "'%s' n'est pas un nom de dépôt distant acceptable." + +#: lib/remote_add.tcl:125 +#, tcl-format +msgid "Failed to add remote '%s' of location '%s'." +msgstr "Échec de l'ajout du dépôt distant '%s' à l'emplacement '%s'." + +#: lib/remote_add.tcl:133 lib/transport.tcl:6 +#, tcl-format +msgid "fetch %s" +msgstr "récupérer %s" + +#: lib/remote_add.tcl:134 +#, tcl-format +msgid "Fetching the %s" +msgstr "Récupération de %s" + +#: lib/remote_add.tcl:157 +#, tcl-format +msgid "Do not know how to initialize repository at location '%s'." +msgstr "Pas de méthode connue pour initialiser le dépôt à l'emplacement '%s'." + +#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 +#: lib/transport.tcl:81 +#, tcl-format +msgid "push %s" +msgstr "pousser %s" + +#: lib/remote_add.tcl:164 +#, tcl-format +msgid "Setting up the %s (at %s)" +msgstr "Mise en place de %s (à %s)" + +#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 +msgid "Delete Branch Remotely" +msgstr "Supprimer une branche à distance" + +#: lib/remote_branch_delete.tcl:47 +msgid "From Repository" +msgstr "Dépôt source" + +#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 +msgid "Remote:" +msgstr "Branche distante :" + +#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 +msgid "Arbitrary Location:" +msgstr "Emplacement arbitraire :" + +#: lib/remote_branch_delete.tcl:84 +msgid "Branches" +msgstr "Branches" + +#: lib/remote_branch_delete.tcl:109 +msgid "Delete Only If" +msgstr "Supprimer seulement si" + +#: lib/remote_branch_delete.tcl:111 +msgid "Merged Into:" +msgstr "Fusionné dans :" + +#: lib/remote_branch_delete.tcl:152 +msgid "A branch is required for 'Merged Into'." +msgstr "Une branche est nécessaire pour 'Fusionné dans'." + +#: lib/remote_branch_delete.tcl:184 +#, tcl-format +msgid "" +"The following branches are not completely merged into %s:\n" +"\n" +" - %s" +msgstr "" +"Les branches suivantes ne sont pas complètement fusionnées dans %s :\n" +"\n" +" - %s" + +#: lib/remote_branch_delete.tcl:189 +#, tcl-format +msgid "" +"One or more of the merge tests failed because you have not fetched the " +"necessary commits. Try fetching from %s first." +msgstr "" +"Un ou plusieurs des tests de fusion ont échoué parce que vous n'avez pas " +"récupéré les commits nécessaires. Essayez de récupérer à partir de %s " +"d'abord." + +#: lib/remote_branch_delete.tcl:207 +msgid "Please select one or more branches to delete." +msgstr "Merci de sélectionner une ou plusieurs branches à supprimer." + +#: lib/remote_branch_delete.tcl:226 +#, tcl-format +msgid "Deleting branches from %s" +msgstr "Suppression des branches de %s" + +#: lib/remote_branch_delete.tcl:292 +msgid "No repository selected." +msgstr "Aucun dépôt n'est sélectionné." + +#: lib/remote_branch_delete.tcl:297 +#, tcl-format +msgid "Scanning %s..." +msgstr "Synchronisation de %s..." + +#: lib/search.tcl:21 +msgid "Find:" +msgstr "Chercher :" + +#: lib/search.tcl:23 +msgid "Next" +msgstr "Suivant" + +#: lib/search.tcl:24 +msgid "Prev" +msgstr "Précédent" + +#: lib/search.tcl:25 +msgid "Case-Sensitive" +msgstr "Sensible à la casse" + +#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 +msgid "Cannot write shortcut:" +msgstr "Impossible d'écrire le raccourci :" + +#: lib/shortcut.tcl:137 +msgid "Cannot write icon:" +msgstr "Impossible d'écrire l'icône :" + +#: lib/spellcheck.tcl:57 +msgid "Unsupported spell checker" +msgstr "Vérificateur d'orthographe non supporté" + +#: lib/spellcheck.tcl:65 +msgid "Spell checking is unavailable" +msgstr "La vérification d'orthographe n'est pas disponible" + +#: lib/spellcheck.tcl:68 +msgid "Invalid spell checking configuration" +msgstr "Configuration de vérification d'orthographe invalide" + +#: lib/spellcheck.tcl:70 +#, tcl-format +msgid "Reverting dictionary to %s." +msgstr "Réinitialisation du dictionnaire à %s." + +#: lib/spellcheck.tcl:73 +msgid "Spell checker silently failed on startup" +msgstr "La vérification d'orthographe a échoué silencieusement au démarrage" + +#: lib/spellcheck.tcl:80 +msgid "Unrecognized spell checker" +msgstr "Vérificateur d'orthographe non reconnu" + +#: lib/spellcheck.tcl:186 +msgid "No Suggestions" +msgstr "Aucune suggestion" + +#: lib/spellcheck.tcl:388 +msgid "Unexpected EOF from spell checker" +msgstr "EOF inattendue envoyée par le vérificateur d'orthographe" + +#: lib/spellcheck.tcl:392 +msgid "Spell Checker Failed" +msgstr "Le vérificateur d'orthographe a échoué" + +#: lib/sshkey.tcl:31 +msgid "No keys found." +msgstr "Aucune clé trouvée." + +#: lib/sshkey.tcl:34 +#, tcl-format +msgid "Found a public key in: %s" +msgstr "Clé publique trouvée dans : %s" + +#: lib/sshkey.tcl:40 +msgid "Generate Key" +msgstr "Générer une clé" + +#: lib/sshkey.tcl:56 +msgid "Copy To Clipboard" +msgstr "Copier dans le presse-papier" + +#: lib/sshkey.tcl:70 +msgid "Your OpenSSH Public Key" +msgstr "Votre clé publique OpenSSH" + +#: lib/sshkey.tcl:78 +msgid "Generating..." +msgstr "Génération..." + +#: lib/sshkey.tcl:84 +#, tcl-format +msgid "" +"Could not start ssh-keygen:\n" +"\n" +"%s" +msgstr "" +"Impossible de lancer ssh-keygen :\n" +"\n" +"%s" + +#: lib/sshkey.tcl:111 +msgid "Generation failed." +msgstr "La génération a échoué." + +#: lib/sshkey.tcl:118 +msgid "Generation succeeded, but no keys found." +msgstr "La génération a réussi, mais aucune clé n'a été trouvée." + +#: lib/sshkey.tcl:121 +#, tcl-format +msgid "Your key is in: %s" +msgstr "Votre clé est dans : %s" + +#: lib/status_bar.tcl:83 +#, tcl-format +msgid "%s ... %*i of %*i %s (%3i%%)" +msgstr "%s ... %*i de %*i %s (%3i%%)" + +#: lib/tools.tcl:75 +#, tcl-format +msgid "Running %s requires a selected file." +msgstr "Lancer %s nécessite qu'un fichier soit sélectionné." + +#: lib/tools.tcl:90 +#, tcl-format +msgid "Are you sure you want to run %s?" +msgstr "Êtes-vous sûr de vouloir lancer %s ?" + +#: lib/tools.tcl:110 +#, tcl-format +msgid "Tool: %s" +msgstr "Outil : %s" + +#: lib/tools.tcl:111 +#, tcl-format +msgid "Running: %s" +msgstr "Lancement de : %s" + +#: lib/tools.tcl:149 +#, tcl-format +msgid "Tool completed successfully: %s" +msgstr "L'outil a terminé avec succès : %s" + +#: lib/tools.tcl:151 +#, tcl-format +msgid "Tool failed: %s" +msgstr "L'outil a échoué : %s" + +#: lib/tools_dlg.tcl:22 +msgid "Add Tool" +msgstr "Ajouter un outil" + +#: lib/tools_dlg.tcl:28 +msgid "Add New Tool Command" +msgstr "Ajouter une nouvelle commande d'outil" + +#: lib/tools_dlg.tcl:33 +msgid "Add globally" +msgstr "Ajouter globalement" + +#: lib/tools_dlg.tcl:45 +msgid "Tool Details" +msgstr "Détails sur l'outil" + +#: lib/tools_dlg.tcl:48 +msgid "Use '/' separators to create a submenu tree:" +msgstr "Utiliser les séparateurs '/' pour créer un arbre de sous-menus :" + +#: lib/tools_dlg.tcl:61 +msgid "Command:" +msgstr "Commande :" + +#: lib/tools_dlg.tcl:74 +msgid "Show a dialog before running" +msgstr "Montrer une boîte de dialogue avant le lancement" + +#: lib/tools_dlg.tcl:80 +msgid "Ask the user to select a revision (sets $REVISION)" +msgstr "" +"Demander à l'utilisateur de sélectionner une révision (change $REVISION)" + +#: lib/tools_dlg.tcl:85 +msgid "Ask the user for additional arguments (sets $ARGS)" +msgstr "Demander à l'utilisateur des arguments supplémentaires (change $ARGS)" + +#: lib/tools_dlg.tcl:92 +msgid "Don't show the command output window" +msgstr "Ne pas montrer la fenêtre de sortie des commandes" + +#: lib/tools_dlg.tcl:97 +msgid "Run only if a diff is selected ($FILENAME not empty)" +msgstr "Lancer seulement si un diff est sélectionné ($FILENAME non vide)" + +#: lib/tools_dlg.tcl:121 +msgid "Please supply a name for the tool." +msgstr "Merci de fournir un nom pour l'outil." + +#: lib/tools_dlg.tcl:129 +#, tcl-format +msgid "Tool '%s' already exists." +msgstr "L'outil '%s' existe déjà." + +#: lib/tools_dlg.tcl:151 +#, tcl-format +msgid "" +"Could not add tool:\n" +"%s" +msgstr "" +"Impossible d'ajouter l'outil :\n" +"%s" + +#: lib/tools_dlg.tcl:190 +msgid "Remove Tool" +msgstr "Supprimer l'outil" + +#: lib/tools_dlg.tcl:196 +msgid "Remove Tool Commands" +msgstr "Supprimer des commandes d'outil" + +#: lib/tools_dlg.tcl:200 +msgid "Remove" +msgstr "Supprimer" + +#: lib/tools_dlg.tcl:236 +msgid "(Blue denotes repository-local tools)" +msgstr "(Le bleu indique des outils locaux au dépôt)" + +#: lib/tools_dlg.tcl:297 +#, tcl-format +msgid "Run Command: %s" +msgstr "Lancer commande : %s" + +#: lib/tools_dlg.tcl:311 +msgid "Arguments" +msgstr "Arguments" + +#: lib/tools_dlg.tcl:348 +msgid "OK" +msgstr "OK" + +#: lib/transport.tcl:7 +#, tcl-format +msgid "Fetching new changes from %s" +msgstr "Récupération des dernières modifications de %s" + +#: lib/transport.tcl:18 +#, tcl-format +msgid "remote prune %s" +msgstr "purger à distance %s" + +#: lib/transport.tcl:19 +#, tcl-format +msgid "Pruning tracking branches deleted from %s" +msgstr "Nettoyer les branches de suivi supprimées de %s" + +#: lib/transport.tcl:26 +#, tcl-format +msgid "Pushing changes to %s" +msgstr "Les modifications sont poussées vers %s" + +#: lib/transport.tcl:64 +#, tcl-format +msgid "Mirroring to %s" +msgstr "Dupliquer dans %s" + +#: lib/transport.tcl:82 +#, tcl-format +msgid "Pushing %s %s to %s" +msgstr "Pousse %s %s vers %s" + +#: lib/transport.tcl:100 +msgid "Push Branches" +msgstr "Pousser branches" + +#: lib/transport.tcl:114 +msgid "Source Branches" +msgstr "Branches source" + +#: lib/transport.tcl:131 +msgid "Destination Repository" +msgstr "Dépôt de destination" + +#: lib/transport.tcl:169 +msgid "Transfer Options" +msgstr "Options de transfert" + +#: lib/transport.tcl:171 +msgid "Force overwrite existing branch (may discard changes)" +msgstr "" +"Forcer l'écrasement d'une branche existante (peut supprimer des " +"modifications)" + +#: lib/transport.tcl:175 +msgid "Use thin pack (for slow network connections)" +msgstr "Utiliser des petits paquets (pour les connexions lentes)" + +#: lib/transport.tcl:179 +msgid "Include tags" +msgstr "Inclure les marques (tags)" + +#~ msgid "Cannot use funny .git directory:" +#~ msgstr "Impossible d'utiliser le répertoire .git:" + +#~ msgid "Preferences..." +#~ msgstr "Préférences..." + +#~ msgid "Always (Do not perform merge test.)" +#~ msgstr "Toujours (Ne pas faire de test de fusion.)" diff --cc git-gui/po/sv.po index 1b4ad8368e,0000000000..de65c18584 mode 100644,000000..100644 --- a/git-gui/po/sv.po +++ b/git-gui/po/sv.po @@@ -1,2736 -1,0 +1,2809 @@@ +# Swedish translation of git-gui. +# Copyright (C) 2007-2008 Shawn Pearce, et al. +# This file is distributed under the same license as the git-gui package. +# +# Mikael Magnusson , 2008. - # Peter Krefting , 2007-2008, 2015. ++# Peter Krefting , 2007-2023. +# +msgid "" +msgstr "" - "Project-Id-Version: sv\n" ++"Project-Id-Version: git-gui 0.21.0\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2015-03-27 10:15+0100\n" - "PO-Revision-Date: 2015-03-27 10:24+0100\n" ++"POT-Creation-Date: 2023-10-26 21:17+0100\n" ++"PO-Revision-Date: 2023-10-26 21:23+0100\n" +"Last-Translator: Peter Krefting \n" +"Language-Team: Swedish \n" +"Language: sv\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" - "X-Generator: Gtranslator 2.91.6\n" ++"X-Generator: Gtranslator 3.38.0\n" + - #: git-gui.sh:861 ++#: git-gui.sh:884 +#, tcl-format +msgid "Invalid font specified in %s:" +msgstr "Ogiltigt teckensnitt angivet i %s:" + - #: git-gui.sh:915 ++#: git-gui.sh:939 +msgid "Main Font" +msgstr "Huvudteckensnitt" + - #: git-gui.sh:916 ++#: git-gui.sh:940 +msgid "Diff/Console Font" +msgstr "Diff/konsolteckensnitt" + - #: git-gui.sh:931 git-gui.sh:945 git-gui.sh:958 git-gui.sh:1048 - #: git-gui.sh:1067 git-gui.sh:3125 ++#: git-gui.sh:955 git-gui.sh:969 git-gui.sh:982 git-gui.sh:1072 git-gui.sh:1091 ++#: git-gui.sh:3233 +msgid "git-gui: fatal error" +msgstr "git-gui: ödesdigert fel" + - #: git-gui.sh:932 ++#: git-gui.sh:956 +msgid "Cannot find git in PATH." +msgstr "Hittar inte git i PATH." + - #: git-gui.sh:959 ++#: git-gui.sh:983 +msgid "Cannot parse Git version string:" +msgstr "Kan inte tolka versionssträng frÃ¥n Git:" + - #: git-gui.sh:984 ++#: git-gui.sh:1008 +#, tcl-format +msgid "" +"Git version cannot be determined.\n" +"\n" +"%s claims it is version '%s'.\n" +"\n" +"%s requires at least Git 1.5.0 or later.\n" +"\n" +"Assume '%s' is version 1.5.0?\n" +msgstr "" +"Kan inte avgöra Gits version.\n" +"\n" - "%s säger att dess version är \"%s\".\n" ++"%s säger att dess version är ”%s”.\n" +"\n" +"%s kräver minst Git 1.5.0 eller senare.\n" +"\n" - "Anta att \"%s\" är version 1.5.0?\n" ++"Anta att ”%s” är version 1.5.0?\n" + - #: git-gui.sh:1281 ++#: git-gui.sh:1302 +msgid "Git directory not found:" +msgstr "Git-katalogen hittades inte:" + - #: git-gui.sh:1315 ++#: git-gui.sh:1332 +msgid "Cannot move to top of working directory:" +msgstr "Kan inte gÃ¥ till början pÃ¥ arbetskatalogen:" + - #: git-gui.sh:1323 ++#: git-gui.sh:1340 +msgid "Cannot use bare repository:" +msgstr "Kan inte använda naket arkiv:" + - #: git-gui.sh:1331 ++#: git-gui.sh:1348 +msgid "No working directory" +msgstr "Ingen arbetskatalog" + - #: git-gui.sh:1503 lib/checkout_op.tcl:306 ++#: git-gui.sh:1523 lib/checkout_op.tcl:306 +msgid "Refreshing file status..." +msgstr "Uppdaterar filstatus..." + - #: git-gui.sh:1563 ++#: git-gui.sh:1567 +msgid "Scanning for modified files ..." +msgstr "Söker efter ändrade filer..." + - #: git-gui.sh:1639 ++#: git-gui.sh:1651 +msgid "Calling prepare-commit-msg hook..." +msgstr "" +"Anropar kroken för förberedelse av incheckningsmeddelande (prepare-commit-" +"msg)..." + - #: git-gui.sh:1656 ++#: git-gui.sh:1668 +msgid "Commit declined by prepare-commit-msg hook." +msgstr "" +"Incheckningen avvisades av kroken för förberedelse av incheckningsmeddelande " +"(prepare-commit-msg)." + - #: git-gui.sh:1814 lib/browser.tcl:252 ++#: git-gui.sh:1826 lib/browser.tcl:252 +msgid "Ready." +msgstr "Klar." + - #: git-gui.sh:1978 ++#: git-gui.sh:1990 +#, tcl-format +msgid "" +"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." +msgstr "" +"Visningsgräns (gui.maxfilesdisplayed = %s) nÃ¥dd, visare inte samtliga %s " +"filer." + - #: git-gui.sh:2101 ++#: git-gui.sh:2113 +msgid "Unmodified" +msgstr "Oförändrade" + - #: git-gui.sh:2103 ++#: git-gui.sh:2115 +msgid "Modified, not staged" +msgstr "Förändrade, ej köade" + - #: git-gui.sh:2104 git-gui.sh:2116 ++#: git-gui.sh:2116 git-gui.sh:2128 +msgid "Staged for commit" +msgstr "Köade för incheckning" + - #: git-gui.sh:2105 git-gui.sh:2117 ++#: git-gui.sh:2117 git-gui.sh:2129 +msgid "Portions staged for commit" +msgstr "Delar köade för incheckning" + - #: git-gui.sh:2106 git-gui.sh:2118 ++#: git-gui.sh:2118 git-gui.sh:2130 +msgid "Staged for commit, missing" +msgstr "Köade för incheckning, saknade" + - #: git-gui.sh:2108 ++#: git-gui.sh:2120 +msgid "File type changed, not staged" +msgstr "Filtyp ändrad, ej köade" + - #: git-gui.sh:2109 git-gui.sh:2110 ++#: git-gui.sh:2121 git-gui.sh:2122 +msgid "File type changed, old type staged for commit" +msgstr "Filtyp ändrad, gammal typ köade för incheckning" + - #: git-gui.sh:2111 ++#: git-gui.sh:2123 +msgid "File type changed, staged" +msgstr "Filtyp ändrad, köade" + - #: git-gui.sh:2112 ++#: git-gui.sh:2124 +msgid "File type change staged, modification not staged" +msgstr "Filtypsändringar köade, innehÃ¥llsändringar ej köade" + - #: git-gui.sh:2113 ++#: git-gui.sh:2125 +msgid "File type change staged, file missing" +msgstr "Filtypsändringar köade, fil saknas" + - #: git-gui.sh:2115 ++#: git-gui.sh:2127 +msgid "Untracked, not staged" +msgstr "Ej spÃ¥rade, ej köade" + - #: git-gui.sh:2120 ++#: git-gui.sh:2132 +msgid "Missing" +msgstr "Saknade" + - #: git-gui.sh:2121 ++#: git-gui.sh:2133 +msgid "Staged for removal" +msgstr "Köade för borttagning" + - #: git-gui.sh:2122 ++#: git-gui.sh:2134 +msgid "Staged for removal, still present" +msgstr "Köade för borttagning, fortfarande närvarande" + - #: git-gui.sh:2124 git-gui.sh:2125 git-gui.sh:2126 git-gui.sh:2127 - #: git-gui.sh:2128 git-gui.sh:2129 ++#: git-gui.sh:2136 git-gui.sh:2137 git-gui.sh:2138 git-gui.sh:2139 ++#: git-gui.sh:2140 git-gui.sh:2141 +msgid "Requires merge resolution" +msgstr "Kräver konflikthantering efter sammanslagning" + - #: git-gui.sh:2164 - msgid "Starting gitk... please wait..." - msgstr "Startar gitk... vänta..." - - #: git-gui.sh:2176 ++#: git-gui.sh:2186 +msgid "Couldn't find gitk in PATH" +msgstr "Hittade inte gitk i PATH." + - #: git-gui.sh:2235 ++#: git-gui.sh:2233 git-gui.sh:2269 ++#, tcl-format ++msgid "Starting %s... please wait..." ++msgstr "Startar %s... vänta..." ++ ++#: git-gui.sh:2248 +msgid "Couldn't find git gui in PATH" +msgstr "Hittade inte git gui i PATH." + - #: git-gui.sh:2654 lib/choose_repository.tcl:41 ++#: git-gui.sh:2751 lib/choose_repository.tcl:53 +msgid "Repository" +msgstr "Arkiv" + - #: git-gui.sh:2655 ++#: git-gui.sh:2752 +msgid "Edit" +msgstr "Redigera" + - #: git-gui.sh:2657 lib/choose_rev.tcl:567 ++#: git-gui.sh:2754 lib/choose_rev.tcl:567 +msgid "Branch" +msgstr "Gren" + - #: git-gui.sh:2660 lib/choose_rev.tcl:554 ++#: git-gui.sh:2757 lib/choose_rev.tcl:554 +msgid "Commit@@noun" +msgstr "Incheckning" + - #: git-gui.sh:2663 lib/merge.tcl:123 lib/merge.tcl:152 lib/merge.tcl:170 ++#: git-gui.sh:2760 lib/merge.tcl:127 lib/merge.tcl:174 +msgid "Merge" +msgstr "SlÃ¥ ihop" + - #: git-gui.sh:2664 lib/choose_rev.tcl:563 ++#: git-gui.sh:2761 lib/choose_rev.tcl:563 +msgid "Remote" +msgstr "Fjärrarkiv" + - #: git-gui.sh:2667 ++#: git-gui.sh:2764 +msgid "Tools" +msgstr "Verktyg" + - #: git-gui.sh:2676 ++#: git-gui.sh:2773 +msgid "Explore Working Copy" +msgstr "Utforska arbetskopia" + - #: git-gui.sh:2682 ++#: git-gui.sh:2788 +msgid "Git Bash" +msgstr "Git Bash" + - #: git-gui.sh:2692 ++#: git-gui.sh:2797 +msgid "Browse Current Branch's Files" +msgstr "Bläddra i grenens filer" + - #: git-gui.sh:2696 ++#: git-gui.sh:2801 +msgid "Browse Branch Files..." +msgstr "Bläddra filer pÃ¥ gren..." + - #: git-gui.sh:2701 ++#: git-gui.sh:2806 +msgid "Visualize Current Branch's History" +msgstr "Visualisera grenens historik" + - #: git-gui.sh:2705 ++#: git-gui.sh:2810 +msgid "Visualize All Branch History" +msgstr "Visualisera alla grenars historik" + - #: git-gui.sh:2712 ++#: git-gui.sh:2817 +#, tcl-format +msgid "Browse %s's Files" +msgstr "Bläddra i filer för %s" + - #: git-gui.sh:2714 ++#: git-gui.sh:2819 +#, tcl-format +msgid "Visualize %s's History" +msgstr "Visualisera historik för %s" + - #: git-gui.sh:2719 lib/database.tcl:40 lib/database.tcl:66 ++#: git-gui.sh:2824 lib/database.tcl:40 +msgid "Database Statistics" +msgstr "Databasstatistik" + - #: git-gui.sh:2722 lib/database.tcl:33 ++#: git-gui.sh:2827 lib/database.tcl:33 +msgid "Compress Database" +msgstr "Komprimera databas" + - #: git-gui.sh:2725 ++#: git-gui.sh:2830 +msgid "Verify Database" +msgstr "Verifiera databas" + - #: git-gui.sh:2732 git-gui.sh:2736 git-gui.sh:2740 lib/shortcut.tcl:8 - #: lib/shortcut.tcl:40 lib/shortcut.tcl:72 ++#: git-gui.sh:2837 git-gui.sh:2841 git-gui.sh:2845 +msgid "Create Desktop Icon" +msgstr "Skapa skrivbordsikon" + - #: git-gui.sh:2748 lib/choose_repository.tcl:193 lib/choose_repository.tcl:201 ++#: git-gui.sh:2853 lib/choose_repository.tcl:206 lib/choose_repository.tcl:214 +msgid "Quit" +msgstr "Avsluta" + - #: git-gui.sh:2756 ++#: git-gui.sh:2861 +msgid "Undo" +msgstr "Ångra" + - #: git-gui.sh:2759 ++#: git-gui.sh:2864 +msgid "Redo" +msgstr "Gör om" + - #: git-gui.sh:2763 git-gui.sh:3368 ++#: git-gui.sh:2868 git-gui.sh:3493 +msgid "Cut" +msgstr "Klipp ut" + - #: git-gui.sh:2766 git-gui.sh:3371 git-gui.sh:3445 git-gui.sh:3530 ++#: git-gui.sh:2871 git-gui.sh:3496 git-gui.sh:3572 git-gui.sh:3665 +#: lib/console.tcl:69 +msgid "Copy" +msgstr "Kopiera" + - #: git-gui.sh:2769 git-gui.sh:3374 ++#: git-gui.sh:2874 git-gui.sh:3499 +msgid "Paste" +msgstr "Klistra in" + - #: git-gui.sh:2772 git-gui.sh:3377 lib/remote_branch_delete.tcl:39 - #: lib/branch_delete.tcl:28 ++#: git-gui.sh:2877 git-gui.sh:3502 lib/branch_delete.tcl:28 ++#: lib/remote_branch_delete.tcl:39 +msgid "Delete" +msgstr "Ta bort" + - #: git-gui.sh:2776 git-gui.sh:3381 git-gui.sh:3534 lib/console.tcl:71 ++#: git-gui.sh:2881 git-gui.sh:3506 git-gui.sh:3669 lib/console.tcl:71 +msgid "Select All" +msgstr "Markera alla" + - #: git-gui.sh:2785 ++#: git-gui.sh:2890 +msgid "Create..." +msgstr "Skapa..." + - #: git-gui.sh:2791 ++#: git-gui.sh:2896 +msgid "Checkout..." +msgstr "Checka ut..." + - #: git-gui.sh:2797 ++#: git-gui.sh:2902 +msgid "Rename..." +msgstr "Byt namn..." + - #: git-gui.sh:2802 ++#: git-gui.sh:2907 +msgid "Delete..." +msgstr "Ta bort..." + - #: git-gui.sh:2807 ++#: git-gui.sh:2912 +msgid "Reset..." +msgstr "Återställ..." + - #: git-gui.sh:2817 ++#: git-gui.sh:2922 +msgid "Done" +msgstr "Färdig" + - #: git-gui.sh:2819 ++#: git-gui.sh:2924 +msgid "Commit@@verb" +msgstr "Checka in" + - #: git-gui.sh:2828 git-gui.sh:3309 - msgid "New Commit" - msgstr "Ny incheckning" - - #: git-gui.sh:2836 git-gui.sh:3316 ++#: git-gui.sh:2933 git-gui.sh:3432 +msgid "Amend Last Commit" +msgstr "Lägg till föregÃ¥ende incheckning" + - #: git-gui.sh:2846 git-gui.sh:3270 lib/remote_branch_delete.tcl:101 ++#: git-gui.sh:2943 git-gui.sh:3393 lib/remote_branch_delete.tcl:101 +msgid "Rescan" +msgstr "Sök pÃ¥ nytt" + - #: git-gui.sh:2852 ++#: git-gui.sh:2949 +msgid "Stage To Commit" +msgstr "Köa för incheckning" + - #: git-gui.sh:2858 ++#: git-gui.sh:2955 +msgid "Stage Changed Files To Commit" +msgstr "Köa ändrade filer för incheckning" + - #: git-gui.sh:2864 ++#: git-gui.sh:2961 +msgid "Unstage From Commit" +msgstr "Ta bort frÃ¥n incheckningskö" + - #: git-gui.sh:2870 lib/index.tcl:442 ++#: git-gui.sh:2967 lib/index.tcl:521 +msgid "Revert Changes" +msgstr "Återställ ändringar" + - #: git-gui.sh:2878 git-gui.sh:3581 git-gui.sh:3612 ++#: git-gui.sh:2975 git-gui.sh:3732 git-gui.sh:3763 +msgid "Show Less Context" +msgstr "Visa mindre sammanhang" + - #: git-gui.sh:2882 git-gui.sh:3585 git-gui.sh:3616 ++#: git-gui.sh:2979 git-gui.sh:3736 git-gui.sh:3767 +msgid "Show More Context" +msgstr "Visa mer sammanhang" + - #: git-gui.sh:2889 git-gui.sh:3283 git-gui.sh:3392 ++#: git-gui.sh:2986 git-gui.sh:3406 git-gui.sh:3517 +msgid "Sign Off" +msgstr "Skriv under" + - #: git-gui.sh:2905 ++#: git-gui.sh:3002 +msgid "Local Merge..." +msgstr "Lokal sammanslagning..." + - #: git-gui.sh:2910 ++#: git-gui.sh:3007 +msgid "Abort Merge..." +msgstr "Avbryt sammanslagning..." + - #: git-gui.sh:2922 git-gui.sh:2950 ++#: git-gui.sh:3019 git-gui.sh:3047 +msgid "Add..." +msgstr "Lägg till..." + - #: git-gui.sh:2926 ++#: git-gui.sh:3023 +msgid "Push..." +msgstr "Sänd..." + - #: git-gui.sh:2930 ++#: git-gui.sh:3027 +msgid "Delete Branch..." +msgstr "Ta bort gren..." + - #: git-gui.sh:2940 git-gui.sh:3563 ++#: git-gui.sh:3037 git-gui.sh:3698 +msgid "Options..." +msgstr "Alternativ..." + - #: git-gui.sh:2951 ++#: git-gui.sh:3048 +msgid "Remove..." +msgstr "Ta bort..." + - #: git-gui.sh:2960 lib/choose_repository.tcl:55 ++#: git-gui.sh:3057 lib/choose_repository.tcl:67 +msgid "Help" +msgstr "Hjälp" + - #: git-gui.sh:2964 git-gui.sh:2968 lib/choose_repository.tcl:49 - #: lib/choose_repository.tcl:58 lib/about.tcl:14 ++#: git-gui.sh:3061 git-gui.sh:3065 lib/about.tcl:14 ++#: lib/choose_repository.tcl:61 lib/choose_repository.tcl:70 +#, tcl-format +msgid "About %s" +msgstr "Om %s" + - #: git-gui.sh:2992 ++#: git-gui.sh:3085 +msgid "Online Documentation" +msgstr "Webbdokumentation" + - #: git-gui.sh:2995 lib/choose_repository.tcl:52 lib/choose_repository.tcl:61 ++#: git-gui.sh:3088 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73 +msgid "Show SSH Key" +msgstr "Visa SSH-nyckel" + - #: git-gui.sh:3014 git-gui.sh:3146 ++#: git-gui.sh:3118 git-gui.sh:3250 ++msgid "usage:" ++msgstr "användning:" ++ ++#: git-gui.sh:3122 git-gui.sh:3254 +msgid "Usage" +msgstr "Användning" + - #: git-gui.sh:3095 lib/blame.tcl:573 ++#: git-gui.sh:3203 lib/blame.tcl:576 +msgid "Error" +msgstr "Fel" + - #: git-gui.sh:3126 ++#: git-gui.sh:3234 +#, tcl-format +msgid "fatal: cannot stat path %s: No such file or directory" +msgstr "" +"ödesdigert: kunde inte ta status pÃ¥ sökvägen %s: Fil eller katalog saknas" + - #: git-gui.sh:3159 ++#: git-gui.sh:3267 +msgid "Current Branch:" +msgstr "Aktuell gren:" + - #: git-gui.sh:3185 - msgid "Staged Changes (Will Commit)" - msgstr "Köade ändringar (kommer att checkas in)" - - #: git-gui.sh:3205 ++#: git-gui.sh:3292 +msgid "Unstaged Changes" +msgstr "Oköade ändringar" + - #: git-gui.sh:3276 ++#: git-gui.sh:3314 ++msgid "Staged Changes (Will Commit)" ++msgstr "Köade ändringar (kommer att checkas in)" ++ ++#: git-gui.sh:3399 +msgid "Stage Changed" +msgstr "Köa ändrade" + - #: git-gui.sh:3295 lib/transport.tcl:137 lib/transport.tcl:229 ++#: git-gui.sh:3418 lib/transport.tcl:137 +msgid "Push" +msgstr "Sänd" + - #: git-gui.sh:3330 ++#: git-gui.sh:3445 +msgid "Initial Commit Message:" +msgstr "Inledande incheckningsmeddelande:" + - #: git-gui.sh:3331 ++#: git-gui.sh:3446 +msgid "Amended Commit Message:" +msgstr "Utökat incheckningsmeddelande:" + - #: git-gui.sh:3332 ++#: git-gui.sh:3447 +msgid "Amended Initial Commit Message:" +msgstr "Utökat inledande incheckningsmeddelande:" + - #: git-gui.sh:3333 ++#: git-gui.sh:3448 +msgid "Amended Merge Commit Message:" +msgstr "Utökat incheckningsmeddelande för sammanslagning:" + - #: git-gui.sh:3334 ++#: git-gui.sh:3449 +msgid "Merge Commit Message:" +msgstr "Incheckningsmeddelande för sammanslagning:" + - #: git-gui.sh:3335 ++#: git-gui.sh:3450 +msgid "Commit Message:" +msgstr "Incheckningsmeddelande:" + - #: git-gui.sh:3384 git-gui.sh:3538 lib/console.tcl:73 ++#: git-gui.sh:3509 git-gui.sh:3673 lib/console.tcl:73 +msgid "Copy All" +msgstr "Kopiera alla" + - #: git-gui.sh:3408 lib/blame.tcl:105 ++#: git-gui.sh:3533 lib/blame.tcl:106 +msgid "File:" +msgstr "Fil:" + - #: git-gui.sh:3526 ++#: git-gui.sh:3581 lib/choose_repository.tcl:1054 ++msgid "Open" ++msgstr "Öppna" ++ ++#: git-gui.sh:3661 +msgid "Refresh" +msgstr "Uppdatera" + - #: git-gui.sh:3547 ++#: git-gui.sh:3682 +msgid "Decrease Font Size" +msgstr "Minska teckensnittsstorlek" + - #: git-gui.sh:3551 ++#: git-gui.sh:3686 +msgid "Increase Font Size" +msgstr "Öka teckensnittsstorlek" + - #: git-gui.sh:3559 lib/blame.tcl:294 ++#: git-gui.sh:3694 lib/blame.tcl:296 +msgid "Encoding" +msgstr "Teckenkodning" + - #: git-gui.sh:3570 ++#: git-gui.sh:3705 +msgid "Apply/Reverse Hunk" +msgstr "Använd/Ã¥terställ del" + - #: git-gui.sh:3575 ++#: git-gui.sh:3710 +msgid "Apply/Reverse Line" +msgstr "Använd/Ã¥terställ rad" + - #: git-gui.sh:3594 ++#: git-gui.sh:3716 git-gui.sh:3826 git-gui.sh:3837 ++msgid "Revert Hunk" ++msgstr "Återställ del" ++ ++#: git-gui.sh:3721 git-gui.sh:3833 git-gui.sh:3844 ++msgid "Revert Line" ++msgstr "Återställ rad" ++ ++#: git-gui.sh:3726 git-gui.sh:3823 ++msgid "Undo Last Revert" ++msgstr "Ångra senaste Ã¥terställning" ++ ++#: git-gui.sh:3745 +msgid "Run Merge Tool" +msgstr "Starta verktyg för sammanslagning" + - #: git-gui.sh:3599 ++#: git-gui.sh:3750 +msgid "Use Remote Version" +msgstr "Använd versionen frÃ¥n fjärrarkivet" + - #: git-gui.sh:3603 ++#: git-gui.sh:3754 +msgid "Use Local Version" +msgstr "Använd lokala versionen" + - #: git-gui.sh:3607 ++#: git-gui.sh:3758 +msgid "Revert To Base" +msgstr "Återställ till basversionen" + - #: git-gui.sh:3625 ++#: git-gui.sh:3776 +msgid "Visualize These Changes In The Submodule" +msgstr "Visualisera ändringarna i undermodulen" + - #: git-gui.sh:3629 ++#: git-gui.sh:3780 +msgid "Visualize Current Branch History In The Submodule" +msgstr "Visualisera grenens historik i undermodulen" + - #: git-gui.sh:3633 ++#: git-gui.sh:3784 +msgid "Visualize All Branch History In The Submodule" +msgstr "Visualisera alla grenars historik i undermodulen" + - #: git-gui.sh:3638 ++#: git-gui.sh:3789 +msgid "Start git gui In The Submodule" +msgstr "Starta git gui i undermodulen" + - #: git-gui.sh:3673 ++#: git-gui.sh:3825 +msgid "Unstage Hunk From Commit" +msgstr "Ta bort del ur incheckningskö" + - #: git-gui.sh:3675 ++#: git-gui.sh:3829 +msgid "Unstage Lines From Commit" +msgstr "Ta bort rader ur incheckningskö" + - #: git-gui.sh:3677 ++#: git-gui.sh:3830 git-gui.sh:3841 ++msgid "Revert Lines" ++msgstr "Återställ rader" ++ ++#: git-gui.sh:3832 +msgid "Unstage Line From Commit" +msgstr "Ta bort rad ur incheckningskö" + - #: git-gui.sh:3680 ++#: git-gui.sh:3836 +msgid "Stage Hunk For Commit" +msgstr "Ställ del i incheckningskö" + - #: git-gui.sh:3682 ++#: git-gui.sh:3840 +msgid "Stage Lines For Commit" +msgstr "Ställ rader i incheckningskö" + - #: git-gui.sh:3684 ++#: git-gui.sh:3843 +msgid "Stage Line For Commit" +msgstr "Ställ rad i incheckningskö" + - #: git-gui.sh:3709 ++#: git-gui.sh:3893 +msgid "Initializing..." +msgstr "Initierar..." + - #: git-gui.sh:3852 - #, tcl-format - msgid "" - "Possible environment issues exist.\n" - "\n" - "The following environment variables are probably\n" - "going to be ignored by any Git subprocess run\n" - "by %s:\n" - "\n" - msgstr "" - "Det finns möjliga problem med miljövariabler.\n" - "\n" - "Följande miljövariabler kommer troligen att\n" - "ignoreras av alla Git-underprocesser som körs\n" - "av %s:\n" - "\n" - - #: git-gui.sh:3881 - msgid "" - "\n" - "This is due to a known issue with the\n" - "Tcl binary distributed by Cygwin." - msgstr "" - "\n" - "Detta beror pÃ¥ ett känt problem med\n" - "Tcl-binären som följer med Cygwin." ++#: lib/about.tcl:26 ++msgid "git-gui - a graphical user interface for Git." ++msgstr "git-gui - ett grafiskt användargränssnitt för Git." + - #: git-gui.sh:3886 ++#: lib/blame.tcl:74 +#, tcl-format - msgid "" - "\n" - "\n" - "A good replacement for %s\n" - "is placing values for the user.name and\n" - "user.email settings into your personal\n" - "~/.gitconfig file.\n" - msgstr "" - "\n" - "\n" - "Du kan ersätta %s\n" - "med att lägga in värden för inställningarna\n" - "user.name och user.email i din personliga\n" - "~/.gitconfig-fil.\n" ++msgid "%s (%s): File Viewer" ++msgstr "%s (%s): Filvisare" + - #: lib/line.tcl:17 - msgid "Goto Line:" - msgstr "GÃ¥ till rad:" ++#: lib/blame.tcl:80 ++msgid "Commit:" ++msgstr "Incheckning:" + - #: lib/line.tcl:23 - msgid "Go" - msgstr "GÃ¥" ++#: lib/blame.tcl:282 ++msgid "Copy Commit" ++msgstr "Kopiera incheckning" + - #: lib/console.tcl:59 - msgid "Working... please wait..." - msgstr "Arbetar... vänta..." ++#: lib/blame.tcl:286 ++msgid "Find Text..." ++msgstr "Sök text..." + - #: lib/console.tcl:81 lib/checkout_op.tcl:146 lib/sshkey.tcl:55 - #: lib/database.tcl:30 - msgid "Close" - msgstr "Stäng" ++#: lib/blame.tcl:290 ++msgid "Goto Line..." ++msgstr "GÃ¥ till rad..." + - #: lib/console.tcl:186 - msgid "Success" - msgstr "Lyckades" ++#: lib/blame.tcl:299 ++msgid "Do Full Copy Detection" ++msgstr "Gör full kopieringsigenkänning" + - #: lib/console.tcl:200 - msgid "Error: Command Failed" - msgstr "Fel: Kommando misslyckades" ++#: lib/blame.tcl:303 ++msgid "Show History Context" ++msgstr "Visa historiksammanhang" + - #: lib/checkout_op.tcl:85 - #, tcl-format - msgid "Fetching %s from %s" - msgstr "Hämtar %s frÃ¥n %s" ++#: lib/blame.tcl:306 ++msgid "Blame Parent Commit" ++msgstr "Klandra föräldraincheckning" + - #: lib/checkout_op.tcl:133 ++#: lib/blame.tcl:469 +#, tcl-format - msgid "fatal: Cannot resolve %s" - msgstr "ödesdigert: Kunde inte slÃ¥ upp %s" ++msgid "Reading %s..." ++msgstr "Läser %s..." + - #: lib/checkout_op.tcl:175 - #, tcl-format - msgid "Branch '%s' does not exist." - msgstr "Grenen \"%s\" finns inte." ++#: lib/blame.tcl:597 ++msgid "Loading copy/move tracking annotations..." ++msgstr "Läser annoteringar för kopiering/flyttning..." + - #: lib/checkout_op.tcl:194 - #, tcl-format - msgid "Failed to configure simplified git-pull for '%s'." - msgstr "Kunde inte konfigurera förenklad git-pull för '%s'." ++#: lib/blame.tcl:614 ++msgid "lines annotated" ++msgstr "rader annoterade" + - #: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102 - #, tcl-format - msgid "Branch '%s' already exists." - msgstr "Grenen \"%s\" finns redan." ++#: lib/blame.tcl:816 ++msgid "Loading original location annotations..." ++msgstr "Läser in annotering av originalplacering..." + - #: lib/checkout_op.tcl:229 - #, tcl-format - msgid "" - "Branch '%s' already exists.\n" - "\n" - "It cannot fast-forward to %s.\n" - "A merge is required." - msgstr "" - "Grenen \"%s\" finns redan.\n" - "\n" - "Den kan inte snabbspolas till %s.\n" - "En sammanslagning krävs." ++#: lib/blame.tcl:819 ++msgid "Annotation complete." ++msgstr "Annotering fullbordad." + - #: lib/checkout_op.tcl:243 - #, tcl-format - msgid "Merge strategy '%s' not supported." - msgstr "Sammanslagningsstrategin \"%s\" stöds inte." ++#: lib/blame.tcl:850 ++msgid "Busy" ++msgstr "Upptagen" + - #: lib/checkout_op.tcl:262 - #, tcl-format - msgid "Failed to update '%s'." - msgstr "Misslyckades med att uppdatera \"%s\"." ++#: lib/blame.tcl:851 ++msgid "Annotation process is already running." ++msgstr "Annoteringsprocess körs redan." + - #: lib/checkout_op.tcl:274 - msgid "Staging area (index) is already locked." - msgstr "KöomrÃ¥det (index) är redan lÃ¥st." ++#: lib/blame.tcl:890 ++msgid "Running thorough copy detection..." ++msgstr "Kör grundlig kopieringsigenkänning..." + - #: lib/checkout_op.tcl:289 - msgid "" - "Last scanned state does not match repository state.\n" - "\n" - "Another Git program has modified this repository since the last scan. A " - "rescan must be performed before the current branch can be changed.\n" - "\n" - "The rescan will be automatically started now.\n" - msgstr "" - "Det senaste inlästa tillstÃ¥ndet motsvarar inte tillstÃ¥ndet i arkivet.\n" - "\n" - "Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du mÃ¥ste " - "utföra en ny sökning innan den aktuella grenen kan ändras.\n" - "\n" - "Sökningen kommer att startas automatiskt nu.\n" ++#: lib/blame.tcl:958 ++msgid "Loading annotation..." ++msgstr "Läser in annotering..." + - #: lib/checkout_op.tcl:345 - #, tcl-format - msgid "Updating working directory to '%s'..." - msgstr "Uppdaterar arbetskatalogen till \"%s\"..." ++#: lib/blame.tcl:1011 ++msgid "Author:" ++msgstr "Författare:" + - #: lib/checkout_op.tcl:346 - msgid "files checked out" - msgstr "filer utcheckade" ++#: lib/blame.tcl:1015 ++msgid "Committer:" ++msgstr "Incheckare:" + - #: lib/checkout_op.tcl:376 - #, tcl-format - msgid "Aborted checkout of '%s' (file level merging is required)." - msgstr "Avbryter utcheckning av \"%s\" (sammanslagning pÃ¥ filnivÃ¥ krävs)." ++#: lib/blame.tcl:1020 ++msgid "Original File:" ++msgstr "Ursprunglig fil:" + - #: lib/checkout_op.tcl:377 - msgid "File level merge required." - msgstr "Sammanslagning pÃ¥ filnivÃ¥ krävs." ++#: lib/blame.tcl:1068 ++msgid "Cannot find HEAD commit:" ++msgstr "Hittar inte incheckning för HEAD:" + - #: lib/checkout_op.tcl:381 - #, tcl-format - msgid "Staying on branch '%s'." - msgstr "Stannar pÃ¥ grenen \"%s\"." ++#: lib/blame.tcl:1123 ++msgid "Cannot find parent commit:" ++msgstr "Hittar inte föräldraincheckning:" + - #: lib/checkout_op.tcl:452 - msgid "" - "You are no longer on a local branch.\n" - "\n" - "If you wanted to be on a branch, create one now starting from 'This Detached " - "Checkout'." - msgstr "" - "Du är inte längre pÃ¥ en lokal gren.\n" - "\n" - "Om du ville vara pÃ¥ en gren skapar du en nu, baserad pÃ¥ \"Denna frÃ¥nkopplade " - "utcheckning\"." ++#: lib/blame.tcl:1138 ++msgid "Unable to display parent" ++msgstr "Kan inte visa förälder" + - #: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 - #, tcl-format - msgid "Checked out '%s'." - msgstr "Checkade ut \"%s\"." ++#: lib/blame.tcl:1139 lib/diff.tcl:345 ++msgid "Error loading diff:" ++msgstr "Fel vid inläsning av differens:" + - #: lib/checkout_op.tcl:535 - #, tcl-format - msgid "Resetting '%s' to '%s' will lose the following commits:" - msgstr "" - "Om du Ã¥terställer \"%s\" till \"%s\" gÃ¥r följande incheckningar förlorade:" ++#: lib/blame.tcl:1280 ++msgid "Originally By:" ++msgstr "Ursprungligen av:" + - #: lib/checkout_op.tcl:557 - msgid "Recovering lost commits may not be easy." - msgstr "Det kanske inte är sÃ¥ enkelt att Ã¥terskapa förlorade incheckningar." ++#: lib/blame.tcl:1286 ++msgid "In File:" ++msgstr "I filen:" ++ ++#: lib/blame.tcl:1291 ++msgid "Copied Or Moved Here By:" ++msgstr "Kopierad eller flyttad hit av:" + - #: lib/checkout_op.tcl:562 ++#: lib/branch_checkout.tcl:16 +#, tcl-format - msgid "Reset '%s'?" - msgstr "Återställa \"%s\"?" ++msgid "%s (%s): Checkout Branch" ++msgstr "%s (%s): Checka ut gren" + - #: lib/checkout_op.tcl:567 lib/merge.tcl:166 lib/tools_dlg.tcl:336 - msgid "Visualize" - msgstr "Visualisera" ++#: lib/branch_checkout.tcl:21 ++msgid "Checkout Branch" ++msgstr "Checka ut gren" + - #: lib/checkout_op.tcl:571 lib/branch_create.tcl:85 - msgid "Reset" - msgstr "Återställ" ++#: lib/branch_checkout.tcl:26 ++msgid "Checkout" ++msgstr "Checka ut" + - #: lib/checkout_op.tcl:579 lib/transport.tcl:141 lib/remote_add.tcl:34 - #: lib/browser.tcl:292 lib/merge.tcl:174 lib/branch_checkout.tcl:30 - #: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41 - #: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/branch_rename.tcl:32 - #: lib/remote_branch_delete.tcl:43 lib/branch_create.tcl:37 - #: lib/branch_delete.tcl:34 ++#: lib/branch_checkout.tcl:30 lib/branch_create.tcl:37 lib/branch_delete.tcl:34 ++#: lib/branch_rename.tcl:32 lib/browser.tcl:292 lib/checkout_op.tcl:580 ++#: lib/choose_font.tcl:45 lib/merge.tcl:178 lib/option.tcl:127 ++#: lib/remote_add.tcl:34 lib/remote_branch_delete.tcl:43 lib/tools_dlg.tcl:41 ++#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/transport.tcl:141 +msgid "Cancel" +msgstr "Avbryt" + - #: lib/checkout_op.tcl:635 - #, tcl-format - msgid "" - "Failed to set current branch.\n" - "\n" - "This working directory is only partially switched. We successfully updated " - "your files, but failed to update an internal Git file.\n" - "\n" - "This should not have occurred. %s will now close and give up." - msgstr "" - "Kunde inte ställa in aktuell gren.\n" - "\n" - "Arbetskatalogen har bara växlats delvis. Vi uppdaterade filerna utan " - "problem, men kunde inte uppdatera en intern fil i Git.\n" - "\n" - "Detta skulle inte ha hänt. %s kommer nu stängas och ge upp." ++#: lib/branch_checkout.tcl:35 lib/browser.tcl:297 lib/tools_dlg.tcl:321 ++msgid "Revision" ++msgstr "Revision" + - #: lib/transport.tcl:6 lib/remote_add.tcl:132 - #, tcl-format - msgid "fetch %s" - msgstr "hämta %s" ++#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:69 lib/option.tcl:310 ++msgid "Options" ++msgstr "Alternativ" + - #: lib/transport.tcl:7 - #, tcl-format - msgid "Fetching new changes from %s" - msgstr "Hämtar nya ändringar frÃ¥n %s" ++#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 ++msgid "Fetch Tracking Branch" ++msgstr "Hämta spÃ¥rande gren" + - #: lib/transport.tcl:18 - #, tcl-format - msgid "remote prune %s" - msgstr "fjärrborttagning %s" ++#: lib/branch_checkout.tcl:47 ++msgid "Detach From Local Branch" ++msgstr "Koppla bort frÃ¥n lokal gren" + - #: lib/transport.tcl:19 ++#: lib/branch_create.tcl:23 +#, tcl-format - msgid "Pruning tracking branches deleted from %s" - msgstr "Tar bort spÃ¥rande grenar som tagits bort frÃ¥n %s" ++msgid "%s (%s): Create Branch" ++msgstr "%s (%s): Skapa gren" + - #: lib/transport.tcl:25 - msgid "fetch all remotes" - msgstr "hämta alla fjärrarkiv" - - #: lib/transport.tcl:26 - msgid "Fetching new changes from all remotes" - msgstr "Hämtar nya ändringar frÃ¥n alla fjärrarkiv" ++#: lib/branch_create.tcl:28 ++msgid "Create New Branch" ++msgstr "Skapa ny gren" + - #: lib/transport.tcl:40 - msgid "remote prune all remotes" - msgstr "rensa alla fjärrarkiv" ++#: lib/branch_create.tcl:33 lib/choose_repository.tcl:386 ++msgid "Create" ++msgstr "Skapa" + - #: lib/transport.tcl:41 - msgid "Pruning tracking branches deleted from all remotes" - msgstr "Rensar spÃ¥rande grenar som tagits bort, frÃ¥n alla fjärrarkiv" ++#: lib/branch_create.tcl:42 ++msgid "Branch Name" ++msgstr "Namn pÃ¥ gren" + - #: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110 - #: lib/remote_add.tcl:162 - #, tcl-format - msgid "push %s" - msgstr "sänd %s" ++#: lib/branch_create.tcl:44 lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 ++msgid "Name:" ++msgstr "Namn:" + - #: lib/transport.tcl:55 - #, tcl-format - msgid "Pushing changes to %s" - msgstr "Sänder ändringar till %s" ++#: lib/branch_create.tcl:57 ++msgid "Match Tracking Branch Name" ++msgstr "Använd namn pÃ¥ spÃ¥rad gren" + - #: lib/transport.tcl:93 - #, tcl-format - msgid "Mirroring to %s" - msgstr "Speglar till %s" ++#: lib/branch_create.tcl:66 ++msgid "Starting Revision" ++msgstr "Inledande revision" + - #: lib/transport.tcl:111 - #, tcl-format - msgid "Pushing %s %s to %s" - msgstr "Sänder %s %s till %s" ++#: lib/branch_create.tcl:72 ++msgid "Update Existing Branch:" ++msgstr "Uppdatera befintlig gren:" + - #: lib/transport.tcl:132 - msgid "Push Branches" - msgstr "Sänd grenar" ++#: lib/branch_create.tcl:75 ++msgid "No" ++msgstr "Nej" + - #: lib/transport.tcl:147 - msgid "Source Branches" - msgstr "Källgrenar" ++#: lib/branch_create.tcl:80 ++msgid "Fast Forward Only" ++msgstr "Endast snabbspolning" + - #: lib/transport.tcl:162 - msgid "Destination Repository" - msgstr "Destinationsarkiv" ++#: lib/branch_create.tcl:85 lib/checkout_op.tcl:572 ++msgid "Reset" ++msgstr "Återställ" + - #: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51 - msgid "Remote:" - msgstr "Fjärrarkiv:" ++#: lib/branch_create.tcl:97 ++msgid "Checkout After Creation" ++msgstr "Checka ut när skapad" + - #: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72 - msgid "Arbitrary Location:" - msgstr "Godtycklig plats:" ++#: lib/branch_create.tcl:132 ++msgid "Please select a tracking branch." ++msgstr "Välj en gren att spÃ¥ra." + - #: lib/transport.tcl:205 - msgid "Transfer Options" - msgstr "Överföringsalternativ" ++#: lib/branch_create.tcl:141 ++#, tcl-format ++msgid "Tracking branch %s is not a branch in the remote repository." ++msgstr "Den spÃ¥rade grenen %s är inte en gren i fjärrarkivet." + - #: lib/transport.tcl:207 - msgid "Force overwrite existing branch (may discard changes)" - msgstr "Tvinga överskrivning av befintlig gren (kan kasta bort ändringar)" ++#: lib/branch_create.tcl:154 lib/branch_rename.tcl:92 ++msgid "Please supply a branch name." ++msgstr "Ange ett namn för grenen." + - #: lib/transport.tcl:211 - msgid "Use thin pack (for slow network connections)" - msgstr "Använd tunt paket (för lÃ¥ngsamma nätverksanslutningar)" ++#: lib/branch_create.tcl:165 lib/branch_rename.tcl:112 ++#, tcl-format ++msgid "'%s' is not an acceptable branch name." ++msgstr "”%s” kan inte användas som namn pÃ¥ grenen." + - #: lib/transport.tcl:215 - msgid "Include tags" - msgstr "Ta med taggar" ++#: lib/branch_delete.tcl:16 ++#, tcl-format ++msgid "%s (%s): Delete Branch" ++msgstr "%s (%s): Ta bort gren" + - #: lib/remote_add.tcl:20 - msgid "Add Remote" - msgstr "Lägg till fjärrarkiv" ++#: lib/branch_delete.tcl:21 ++msgid "Delete Local Branch" ++msgstr "Ta bort lokal gren" + - #: lib/remote_add.tcl:25 - msgid "Add New Remote" - msgstr "Lägg till nytt fjärrarkiv" ++#: lib/branch_delete.tcl:39 ++msgid "Local Branches" ++msgstr "Lokala grenar" + - #: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 - msgid "Add" - msgstr "Lägg till" ++#: lib/branch_delete.tcl:51 ++msgid "Delete Only If Merged Into" ++msgstr "Ta bara bort om sammanslagen med" + - #: lib/remote_add.tcl:39 - msgid "Remote Details" - msgstr "Detaljer för fjärrarkiv" ++#: lib/branch_delete.tcl:53 lib/remote_branch_delete.tcl:120 ++msgid "Always (Do not perform merge checks)" ++msgstr "Alltid (utför inte sammanslagningstest)" + - #: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44 - msgid "Name:" - msgstr "Namn:" ++#: lib/branch_delete.tcl:103 ++#, tcl-format ++msgid "The following branches are not completely merged into %s:" ++msgstr "Följande grenar är inte till fullo sammanslagna med %s:" + - #: lib/remote_add.tcl:50 - msgid "Location:" - msgstr "Plats:" ++#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:218 ++msgid "" ++"Recovering deleted branches is difficult.\n" ++"\n" ++"Delete the selected branches?" ++msgstr "" ++"Det kan vara svÃ¥rt att Ã¥terställa borttagna grenar.\n" ++"\n" ++"Ta bort de valda grenarna?" + - #: lib/remote_add.tcl:60 - msgid "Further Action" - msgstr "Ytterligare Ã¥tgärd" ++#: lib/branch_delete.tcl:131 ++#, tcl-format ++msgid " - %s:" ++msgstr " - %s:" + - #: lib/remote_add.tcl:63 - msgid "Fetch Immediately" - msgstr "Hämta omedelbart" ++#: lib/branch_delete.tcl:141 ++#, tcl-format ++msgid "" ++"Failed to delete branches:\n" ++"%s" ++msgstr "" ++"Kunde inte ta bort grenar:\n" ++"%s" + - #: lib/remote_add.tcl:69 - msgid "Initialize Remote Repository and Push" - msgstr "Initiera fjärrarkiv och sänd till" ++#: lib/branch_rename.tcl:15 ++#, tcl-format ++msgid "%s (%s): Rename Branch" ++msgstr "%s (%s): Byt namn pÃ¥ gren" + - #: lib/remote_add.tcl:75 - msgid "Do Nothing Else Now" - msgstr "Gör ingent mer nu" ++#: lib/branch_rename.tcl:23 ++msgid "Rename Branch" ++msgstr "Byt namn pÃ¥ gren" + - #: lib/remote_add.tcl:100 - msgid "Please supply a remote name." - msgstr "Ange ett namn för fjärrarkivet." ++#: lib/branch_rename.tcl:28 ++msgid "Rename" ++msgstr "Byt namn" + - #: lib/remote_add.tcl:113 - #, tcl-format - msgid "'%s' is not an acceptable remote name." - msgstr "\"%s\" kan inte användas som namn pÃ¥ fjärrarkivet." ++#: lib/branch_rename.tcl:38 ++msgid "Branch:" ++msgstr "Gren:" + - #: lib/remote_add.tcl:124 - #, tcl-format - msgid "Failed to add remote '%s' of location '%s'." - msgstr "Kunde inte lägga till fjärrarkivet \"%s\" pÃ¥ platsen \"%s\"." ++#: lib/branch_rename.tcl:46 ++msgid "New Name:" ++msgstr "Nytt namn:" + - #: lib/remote_add.tcl:133 - #, tcl-format - msgid "Fetching the %s" - msgstr "Hämtar %s" ++#: lib/branch_rename.tcl:81 ++msgid "Please select a branch to rename." ++msgstr "Välj en gren att byta namn pÃ¥." + - #: lib/remote_add.tcl:156 ++#: lib/branch_rename.tcl:102 lib/checkout_op.tcl:202 +#, tcl-format - msgid "Do not know how to initialize repository at location '%s'." - msgstr "Vet inte hur arkivet pÃ¥ platsen \"%s\" skall initieras." ++msgid "Branch '%s' already exists." ++msgstr "Grenen ”%s” finns redan." + - #: lib/remote_add.tcl:163 ++#: lib/branch_rename.tcl:123 +#, tcl-format - msgid "Setting up the %s (at %s)" - msgstr "Konfigurerar %s (pÃ¥ %s)" ++msgid "Failed to rename '%s'." ++msgstr "Kunde inte byta namn pÃ¥ ”%s”." + +#: lib/browser.tcl:17 +msgid "Starting..." +msgstr "Startar..." + +#: lib/browser.tcl:27 - msgid "File Browser" - msgstr "Filbläddrare" ++#, tcl-format ++msgid "%s (%s): File Browser" ++msgstr "%s (%s): Filbläddrare" + +#: lib/browser.tcl:132 lib/browser.tcl:149 +#, tcl-format +msgid "Loading %s..." +msgstr "Läser %s..." + +#: lib/browser.tcl:193 +msgid "[Up To Parent]" +msgstr "[Upp till förälder]" + - #: lib/browser.tcl:275 lib/browser.tcl:282 ++#: lib/browser.tcl:275 ++#, tcl-format ++msgid "%s (%s): Browse Branch Files" ++msgstr "%s (%s): Bläddra filer pÃ¥ grenen" ++ ++#: lib/browser.tcl:282 +msgid "Browse Branch Files" +msgstr "Bläddra filer pÃ¥ grenen" + - #: lib/browser.tcl:288 lib/choose_repository.tcl:422 - #: lib/choose_repository.tcl:509 lib/choose_repository.tcl:518 - #: lib/choose_repository.tcl:1074 ++#: lib/browser.tcl:288 lib/choose_repository.tcl:401 ++#: lib/choose_repository.tcl:488 lib/choose_repository.tcl:497 ++#: lib/choose_repository.tcl:1069 +msgid "Browse" +msgstr "Bläddra" + - #: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321 - msgid "Revision" - msgstr "Revision" ++#: lib/checkout_op.tcl:85 ++#, tcl-format ++msgid "Fetching %s from %s" ++msgstr "Hämtar %s frÃ¥n %s" + - #: lib/merge.tcl:13 ++#: lib/checkout_op.tcl:133 ++#, tcl-format ++msgid "fatal: Cannot resolve %s" ++msgstr "ödesdigert: Kunde inte slÃ¥ upp %s" ++ ++#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:30 ++#: lib/sshkey.tcl:58 ++msgid "Close" ++msgstr "Stäng" ++ ++#: lib/checkout_op.tcl:175 ++#, tcl-format ++msgid "Branch '%s' does not exist." ++msgstr "Grenen ”%s” finns inte." ++ ++#: lib/checkout_op.tcl:194 ++#, tcl-format ++msgid "Failed to configure simplified git-pull for '%s'." ++msgstr "Kunde inte konfigurera förenklad git-pull för '%s'." ++ ++#: lib/checkout_op.tcl:229 ++#, tcl-format +msgid "" - "Cannot merge while amending.\n" ++"Branch '%s' already exists.\n" +"\n" - "You must finish amending this commit before starting any type of merge.\n" ++"It cannot fast-forward to %s.\n" ++"A merge is required." +msgstr "" - "Kan inte slÃ¥ ihop vid utökning.\n" ++"Grenen ”%s” finns redan.\n" +"\n" - "Du mÃ¥ste göra färdig utökningen av incheckningen innan du pÃ¥börjar nÃ¥gon " - "slags sammanslagning.\n" ++"Den kan inte snabbspolas till %s.\n" ++"En sammanslagning krävs." + - #: lib/merge.tcl:27 ++#: lib/checkout_op.tcl:243 ++#, tcl-format ++msgid "Merge strategy '%s' not supported." ++msgstr "Sammanslagningsstrategin ”%s” stöds inte." ++ ++#: lib/checkout_op.tcl:262 ++#, tcl-format ++msgid "Failed to update '%s'." ++msgstr "Misslyckades med att uppdatera ”%s”." ++ ++#: lib/checkout_op.tcl:274 ++msgid "Staging area (index) is already locked." ++msgstr "KöomrÃ¥det (index) är redan lÃ¥st." ++ ++#: lib/checkout_op.tcl:289 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " - "rescan must be performed before a merge can be performed.\n" ++"rescan must be performed before the current branch can be changed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"Det senaste inlästa tillstÃ¥ndet motsvarar inte tillstÃ¥ndet i arkivet.\n" +"\n" +"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du mÃ¥ste " - "utföra en ny sökning innan du kan utföra en sammanslagning.\n" ++"utföra en ny sökning innan den aktuella grenen kan ändras.\n" +"\n" +"Sökningen kommer att startas automatiskt nu.\n" + - #: lib/merge.tcl:45 ++#: lib/checkout_op.tcl:345 +#, tcl-format - msgid "" - "You are in the middle of a conflicted merge.\n" - "\n" - "File %s has merge conflicts.\n" - "\n" - "You must resolve them, stage the file, and commit to complete the current " - "merge. Only then can you begin another merge.\n" - msgstr "" - "Du är mitt i en sammanslagning med konflikter.\n" - "\n" - "Filen %s har sammanslagningskonflikter.\n" - "\n" - "Du mÃ¥ste lösa dem, köa filen och checka in för att fullborda den aktuella " - "sammanslagningen. När du gjort det kan du pÃ¥börja en ny sammanslagning.\n" ++msgid "Updating working directory to '%s'..." ++msgstr "Uppdaterar arbetskatalogen till ”%s”..." + - #: lib/merge.tcl:55 ++#: lib/checkout_op.tcl:346 ++msgid "files checked out" ++msgstr "filer utcheckade" ++ ++#: lib/checkout_op.tcl:377 ++#, tcl-format ++msgid "Aborted checkout of '%s' (file level merging is required)." ++msgstr "Avbryter utcheckning av ”%s” (sammanslagning pÃ¥ filnivÃ¥ krävs)." ++ ++#: lib/checkout_op.tcl:378 ++msgid "File level merge required." ++msgstr "Sammanslagning pÃ¥ filnivÃ¥ krävs." ++ ++#: lib/checkout_op.tcl:382 +#, tcl-format ++msgid "Staying on branch '%s'." ++msgstr "Stannar pÃ¥ grenen ”%s”." ++ ++#: lib/checkout_op.tcl:453 +msgid "" - "You are in the middle of a change.\n" - "\n" - "File %s is modified.\n" ++"You are no longer on a local branch.\n" +"\n" - "You should complete the current commit before starting a merge. Doing so " - "will help you abort a failed merge, should the need arise.\n" ++"If you wanted to be on a branch, create one now starting from 'This Detached " ++"Checkout'." +msgstr "" - "Du är mitt i en ändring.\n" - "\n" - "Filen %s har ändringar.\n" ++"Du är inte längre pÃ¥ en lokal gren.\n" +"\n" - "Du bör fullborda den aktuella incheckningen innan du pÃ¥börjar en " - "sammanslagning. Om du gör det blir det enklare att avbryta en misslyckad " - "sammanslagning, om det skulle vara nödvändigt.\n" ++"Om du ville vara pÃ¥ en gren skapar du en nu, baserad pÃ¥ ”Denna frÃ¥nkopplade " ++"utcheckning”." + - #: lib/merge.tcl:108 ++#: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508 +#, tcl-format - msgid "%s of %s" - msgstr "%s av %s" ++msgid "Checked out '%s'." ++msgstr "Checkade ut ”%s”." + - #: lib/merge.tcl:122 ++#: lib/checkout_op.tcl:536 +#, tcl-format - msgid "Merging %s and %s..." - msgstr "SlÃ¥r ihop %s och %s..." - - #: lib/merge.tcl:133 - msgid "Merge completed successfully." - msgstr "Sammanslagningen avslutades framgÃ¥ngsrikt." ++msgid "Resetting '%s' to '%s' will lose the following commits:" ++msgstr "Om du Ã¥terställer ”%s” till ”%s” gÃ¥r följande incheckningar förlorade:" + - #: lib/merge.tcl:135 - msgid "Merge failed. Conflict resolution is required." - msgstr "Sammanslagningen misslyckades. Du mÃ¥ste lösa konflikterna." ++#: lib/checkout_op.tcl:558 ++msgid "Recovering lost commits may not be easy." ++msgstr "Det kanske inte är sÃ¥ enkelt att Ã¥terskapa förlorade incheckningar." + - #: lib/merge.tcl:160 ++#: lib/checkout_op.tcl:563 +#, tcl-format - msgid "Merge Into %s" - msgstr "SlÃ¥ ihop i %s" - - #: lib/merge.tcl:179 - msgid "Revision To Merge" - msgstr "Revisioner att slÃ¥ ihop" ++msgid "Reset '%s'?" ++msgstr "Återställa ”%s”?" + - #: lib/merge.tcl:214 - msgid "" - "Cannot abort while amending.\n" - "\n" - "You must finish amending this commit.\n" - msgstr "" - "Kan inte avbryta vid utökning.\n" - "\n" - "Du mÃ¥ste göra dig färdig med att utöka incheckningen.\n" ++#: lib/checkout_op.tcl:568 lib/merge.tcl:170 lib/tools_dlg.tcl:336 ++msgid "Visualize" ++msgstr "Visualisera" + - #: lib/merge.tcl:224 ++#: lib/checkout_op.tcl:636 ++#, tcl-format +msgid "" - "Abort merge?\n" ++"Failed to set current branch.\n" +"\n" - "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" ++"This working directory is only partially switched. We successfully updated " ++"your files, but failed to update an internal Git file.\n" +"\n" - "Continue with aborting the current merge?" ++"This should not have occurred. %s will now close and give up." +msgstr "" - "Avbryt sammanslagning?\n" ++"Kunde inte ställa in aktuell gren.\n" +"\n" - "Om du avbryter sammanslagningen kommer *ALLA* ej incheckade ändringar att gÃ¥ " - "förlorade.\n" ++"Arbetskatalogen har bara växlats delvis. Vi uppdaterade filerna utan " ++"problem, men kunde inte uppdatera en intern fil i Git.\n" +"\n" - "GÃ¥ vidare med att avbryta den aktuella sammanslagningen?" ++"Detta skulle inte ha hänt. %s kommer nu stängas och ge upp." ++ ++#: lib/choose_font.tcl:41 ++msgid "Select" ++msgstr "Välj" ++ ++#: lib/choose_font.tcl:55 ++msgid "Font Family" ++msgstr "Teckensnittsfamilj" ++ ++#: lib/choose_font.tcl:76 ++msgid "Font Size" ++msgstr "Storlek" ++ ++#: lib/choose_font.tcl:93 ++msgid "Font Example" ++msgstr "Exempel" + - #: lib/merge.tcl:230 ++#: lib/choose_font.tcl:105 +msgid "" - "Reset changes?\n" - "\n" - "Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" - "\n" - "Continue with resetting the current changes?" ++"This is example text.\n" ++"If you like this text, it can be your font." +msgstr "" - "Återställ ändringar?\n" - "\n" - "Om du Ã¥terställer ändringarna kommer *ALLA* ej incheckade ändringar att gÃ¥ " - "förlorade.\n" - "\n" - "GÃ¥ vidare med att Ã¥terställa de aktuella ändringarna?" ++"Detta är en exempeltext.\n" ++"Om du tycker om den här texten kan den vara ditt teckensnitt." + - #: lib/merge.tcl:241 - msgid "Aborting" - msgstr "Avbryter" ++#: lib/choose_repository.tcl:45 ++msgid "Git Gui" ++msgstr "Git Gui" + - #: lib/merge.tcl:241 - msgid "files reset" - msgstr "filer Ã¥terställda" ++#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:391 ++msgid "Create New Repository" ++msgstr "Skapa nytt arkiv" + - #: lib/merge.tcl:269 - msgid "Abort failed." - msgstr "Misslyckades avbryta." ++#: lib/choose_repository.tcl:110 ++msgid "New..." ++msgstr "Nytt..." + - #: lib/merge.tcl:271 - msgid "Abort completed. Ready." - msgstr "Avbrytning fullbordad. Redo." ++#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:475 ++msgid "Clone Existing Repository" ++msgstr "Klona befintligt arkiv" + - #: lib/tools.tcl:75 - #, tcl-format - msgid "Running %s requires a selected file." - msgstr "För att starta %s mÃ¥ste du välja en fil." ++#: lib/choose_repository.tcl:128 ++msgid "Clone..." ++msgstr "Klona..." + - #: lib/tools.tcl:91 - #, tcl-format - msgid "Are you sure you want to run %1$s on file \"%2$s\"?" - msgstr "Är du säker pÃ¥ att du vill starta %1$s med filen \"%2$s\"?" ++#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1059 ++msgid "Open Existing Repository" ++msgstr "Öppna befintligt arkiv" + - #: lib/tools.tcl:95 - #, tcl-format - msgid "Are you sure you want to run %s?" - msgstr "Är du säker pÃ¥ att du vill starta %s?" ++#: lib/choose_repository.tcl:141 ++msgid "Open..." ++msgstr "Öppna..." + - #: lib/tools.tcl:116 - #, tcl-format - msgid "Tool: %s" - msgstr "Verktyg: %s" ++#: lib/choose_repository.tcl:154 ++msgid "Recent Repositories" ++msgstr "Senaste arkiven" ++ ++#: lib/choose_repository.tcl:164 ++msgid "Open Recent Repository:" ++msgstr "Öppna tidigare arkiv:" + - #: lib/tools.tcl:117 ++#: lib/choose_repository.tcl:328 lib/choose_repository.tcl:335 ++#: lib/choose_repository.tcl:342 +#, tcl-format - msgid "Running: %s" - msgstr "Exekverar: %s" ++msgid "Failed to create repository %s:" ++msgstr "Kunde inte skapa arkivet %s:" + - #: lib/tools.tcl:155 ++#: lib/choose_repository.tcl:396 ++msgid "Directory:" ++msgstr "Katalog:" ++ ++#: lib/choose_repository.tcl:426 lib/choose_repository.tcl:552 ++#: lib/choose_repository.tcl:1093 ++msgid "Git Repository" ++msgstr "Gitarkiv" ++ ++#: lib/choose_repository.tcl:451 +#, tcl-format - msgid "Tool completed successfully: %s" - msgstr "Verktyget avslutades framgÃ¥ngsrikt: %s" ++msgid "Directory %s already exists." ++msgstr "Katalogen %s finns redan." + - #: lib/tools.tcl:157 ++#: lib/choose_repository.tcl:455 +#, tcl-format - msgid "Tool failed: %s" - msgstr "Verktyget misslyckades: %s" ++msgid "File %s already exists." ++msgstr "Filen %s finns redan." + - #: lib/branch_checkout.tcl:16 lib/branch_checkout.tcl:21 - msgid "Checkout Branch" - msgstr "Checka ut gren" ++#: lib/choose_repository.tcl:470 ++msgid "Clone" ++msgstr "Klona" + - #: lib/branch_checkout.tcl:26 - msgid "Checkout" - msgstr "Checka ut" ++#: lib/choose_repository.tcl:483 ++msgid "Source Location:" ++msgstr "Plats för källkod:" + - #: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69 - msgid "Options" - msgstr "Alternativ" ++#: lib/choose_repository.tcl:492 ++msgid "Target Directory:" ++msgstr "MÃ¥lkatalog:" + - #: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 - msgid "Fetch Tracking Branch" - msgstr "Hämta spÃ¥rande gren" ++#: lib/choose_repository.tcl:502 ++msgid "Clone Type:" ++msgstr "Typ av klon:" + - #: lib/branch_checkout.tcl:47 - msgid "Detach From Local Branch" - msgstr "Koppla bort frÃ¥n lokal gren" ++#: lib/choose_repository.tcl:507 ++msgid "Standard (Fast, Semi-Redundant, Hardlinks)" ++msgstr "Standard (snabb, semiredundant, hÃ¥rda länkar)" + - #: lib/spellcheck.tcl:57 - msgid "Unsupported spell checker" - msgstr "Stavningskontrollprogrammet stöds inte" ++#: lib/choose_repository.tcl:512 ++msgid "Full Copy (Slower, Redundant Backup)" ++msgstr "Full kopia (lÃ¥ngsammare, redundant säkerhetskopia)" + - #: lib/spellcheck.tcl:65 - msgid "Spell checking is unavailable" - msgstr "Stavningskontroll är ej tillgänglig" ++#: lib/choose_repository.tcl:517 ++msgid "Shared (Fastest, Not Recommended, No Backup)" ++msgstr "Delad (snabbast, rekommenderas ej, ingen säkerhetskopia)" + - #: lib/spellcheck.tcl:68 - msgid "Invalid spell checking configuration" - msgstr "Ogiltig inställning för stavningskontroll" ++#: lib/choose_repository.tcl:524 ++msgid "Recursively clone submodules too" ++msgstr "Klona även rekursivt undermoduler" + - #: lib/spellcheck.tcl:70 ++#: lib/choose_repository.tcl:558 lib/choose_repository.tcl:605 ++#: lib/choose_repository.tcl:744 lib/choose_repository.tcl:818 ++#: lib/choose_repository.tcl:1099 lib/choose_repository.tcl:1107 +#, tcl-format - msgid "Reverting dictionary to %s." - msgstr "Återställer ordlistan till %s." ++msgid "Not a Git repository: %s" ++msgstr "Inte ett Gitarkiv: %s" + - #: lib/spellcheck.tcl:73 - msgid "Spell checker silently failed on startup" - msgstr "Stavningskontroll misslyckades tyst vid start" ++#: lib/choose_repository.tcl:594 ++msgid "Standard only available for local repository." ++msgstr "Standard är endast tillgängligt för lokala arkiv." + - #: lib/spellcheck.tcl:80 - msgid "Unrecognized spell checker" - msgstr "Stavningskontrollprogrammet känns inte igen" ++#: lib/choose_repository.tcl:598 ++msgid "Shared only available for local repository." ++msgstr "Delat är endast tillgängligt för lokala arkiv." + - #: lib/spellcheck.tcl:186 - msgid "No Suggestions" - msgstr "Inga förslag" ++#: lib/choose_repository.tcl:613 ++#, tcl-format ++msgid "Location %s already exists." ++msgstr "Platsen %s finns redan." + - #: lib/spellcheck.tcl:388 - msgid "Unexpected EOF from spell checker" - msgstr "Oväntat filslut frÃ¥n stavningskontroll" ++#: lib/choose_repository.tcl:624 ++msgid "Failed to configure origin" ++msgstr "Kunde inte konfigurera ursprung" + - #: lib/spellcheck.tcl:392 - msgid "Spell Checker Failed" - msgstr "Stavningskontroll misslyckades" ++#: lib/choose_repository.tcl:636 ++msgid "Counting objects" ++msgstr "Räknar objekt" ++ ++#: lib/choose_repository.tcl:637 ++msgid "buckets" ++msgstr "hinkar" + - #: lib/status_bar.tcl:87 ++#: lib/choose_repository.tcl:657 +#, tcl-format - msgid "%s ... %*i of %*i %s (%3i%%)" - msgstr "%s... %*i av %*i %s (%3i%%)" ++msgid "Unable to copy objects/info/alternates: %s" ++msgstr "Kunde inte kopiera objekt/info/alternativ: %s" + - #: lib/diff.tcl:77 ++#: lib/choose_repository.tcl:694 +#, tcl-format - msgid "" - "No differences detected.\n" - "\n" - "%s has no changes.\n" - "\n" ++msgid "Nothing to clone from %s." ++msgstr "Ingenting att klona frÃ¥n %s." ++ ++#: lib/choose_repository.tcl:696 lib/choose_repository.tcl:916 ++#: lib/choose_repository.tcl:928 ++msgid "The 'master' branch has not been initialized." ++msgstr "Grenen ”master” har inte initierats." ++ ++#: lib/choose_repository.tcl:709 ++msgid "Hardlinks are unavailable. Falling back to copying." ++msgstr "HÃ¥rda länkar är inte tillgängliga. Faller tillbaka pÃ¥ kopiering." ++ ++#: lib/choose_repository.tcl:723 ++#, tcl-format ++msgid "Cloning from %s" ++msgstr "Klonar frÃ¥n %s" ++ ++#: lib/choose_repository.tcl:754 ++msgid "Copying objects" ++msgstr "Kopierar objekt" ++ ++#: lib/choose_repository.tcl:755 ++msgid "KiB" ++msgstr "KiB" ++ ++#: lib/choose_repository.tcl:779 ++#, tcl-format ++msgid "Unable to copy object: %s" ++msgstr "Kunde inte kopiera objekt: %s" ++ ++#: lib/choose_repository.tcl:791 ++msgid "Linking objects" ++msgstr "Länkar objekt" ++ ++#: lib/choose_repository.tcl:792 ++msgid "objects" ++msgstr "objekt" ++ ++#: lib/choose_repository.tcl:800 ++#, tcl-format ++msgid "Unable to hardlink object: %s" ++msgstr "Kunde inte hÃ¥rdlänka objekt: %s" ++ ++#: lib/choose_repository.tcl:857 ++msgid "Cannot fetch branches and objects. See console output for details." ++msgstr "Kunde inte hämta grenar och objekt. Se konsolutdata för detaljer." ++ ++#: lib/choose_repository.tcl:868 ++msgid "Cannot fetch tags. See console output for details." ++msgstr "Kunde inte hämta taggar. Se konsolutdata för detaljer." ++ ++#: lib/choose_repository.tcl:892 ++msgid "Cannot determine HEAD. See console output for details." ++msgstr "Kunde inte avgöra HEAD. Se konsolutdata för detaljer." ++ ++#: lib/choose_repository.tcl:901 ++#, tcl-format ++msgid "Unable to cleanup %s" ++msgstr "Kunde inte städa upp %s" ++ ++#: lib/choose_repository.tcl:907 ++msgid "Clone failed." ++msgstr "Kloning misslyckades." ++ ++#: lib/choose_repository.tcl:914 ++msgid "No default branch obtained." ++msgstr "Hämtade ingen standardgren." ++ ++#: lib/choose_repository.tcl:925 ++#, tcl-format ++msgid "Cannot resolve %s as a commit." ++msgstr "Kunde inte slÃ¥ upp %s till nÃ¥gon incheckning." ++ ++#: lib/choose_repository.tcl:952 ++msgid "Creating working directory" ++msgstr "Skapar arbetskatalog" ++ ++#: lib/choose_repository.tcl:953 lib/index.tcl:77 lib/index.tcl:146 ++#: lib/index.tcl:220 lib/index.tcl:589 ++msgid "files" ++msgstr "filer" ++ ++#: lib/choose_repository.tcl:982 ++msgid "Initial file checkout failed." ++msgstr "Inledande filutcheckning misslyckades." ++ ++#: lib/choose_repository.tcl:1026 ++msgid "Cloning submodules" ++msgstr "Klonar undermoduler" ++ ++#: lib/choose_repository.tcl:1041 ++msgid "Cannot clone submodules." ++msgstr "Kan inte klona undermoduler." ++ ++#: lib/choose_repository.tcl:1064 ++msgid "Repository:" ++msgstr "Arkiv:" ++ ++#: lib/choose_repository.tcl:1113 ++#, tcl-format ++msgid "Failed to open repository %s:" ++msgstr "Kunde inte öppna arkivet %s:" ++ ++#: lib/choose_rev.tcl:52 ++msgid "This Detached Checkout" ++msgstr "Denna frÃ¥nkopplade utcheckning" ++ ++#: lib/choose_rev.tcl:60 ++msgid "Revision Expression:" ++msgstr "Revisionsuttryck:" ++ ++#: lib/choose_rev.tcl:72 ++msgid "Local Branch" ++msgstr "Lokal gren" ++ ++#: lib/choose_rev.tcl:77 ++msgid "Tracking Branch" ++msgstr "SpÃ¥rande gren" ++ ++#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 ++msgid "Tag" ++msgstr "Tagg" ++ ++#: lib/choose_rev.tcl:321 ++#, tcl-format ++msgid "Invalid revision: %s" ++msgstr "Ogiltig revision: %s" ++ ++#: lib/choose_rev.tcl:342 ++msgid "No revision selected." ++msgstr "Ingen revision vald." ++ ++#: lib/choose_rev.tcl:350 ++msgid "Revision expression is empty." ++msgstr "Revisionsuttrycket är tomt." ++ ++#: lib/choose_rev.tcl:537 ++msgid "Updated" ++msgstr "Uppdaterad" ++ ++#: lib/choose_rev.tcl:565 ++msgid "URL" ++msgstr "Webbadress" ++ ++#: lib/commit.tcl:9 ++msgid "" ++"There is nothing to amend.\n" ++"\n" ++"You are about to create the initial commit. There is no commit before this " ++"to amend.\n" ++msgstr "" ++"Det finns ingenting att utöka.\n" ++"\n" ++"Du hÃ¥ller pÃ¥ att skapa den inledande incheckningen. Det finns ingen tidigare " ++"incheckning att utöka.\n" ++ ++#: lib/commit.tcl:18 ++msgid "" ++"Cannot amend while merging.\n" ++"\n" ++"You are currently in the middle of a merge that has not been fully " ++"completed. You cannot amend the prior commit unless you first abort the " ++"current merge activity.\n" ++msgstr "" ++"Kan inte utöka vid sammanslagning.\n" ++"\n" ++"Du är i mitten av en sammanslagning som inte är fullbordad. Du kan inte " ++"utöka tidigare incheckningar om du inte först avbryter den pÃ¥gÃ¥ende " ++"sammanslagningen.\n" ++ ++#: lib/commit.tcl:56 ++msgid "Error loading commit data for amend:" ++msgstr "Fel vid inläsning av incheckningsdata för utökning:" ++ ++#: lib/commit.tcl:83 ++msgid "Unable to obtain your identity:" ++msgstr "Kunde inte hämta din identitet:" ++ ++#: lib/commit.tcl:88 ++msgid "Invalid GIT_COMMITTER_IDENT:" ++msgstr "Felaktig GIT_COMMITTER_IDENT:" ++ ++#: lib/commit.tcl:138 ++#, tcl-format ++msgid "warning: Tcl does not support encoding '%s'." ++msgstr "varning: Tcl stöder inte teckenkodningen ”%s”." ++ ++#: lib/commit.tcl:158 ++msgid "" ++"Last scanned state does not match repository state.\n" ++"\n" ++"Another Git program has modified this repository since the last scan. A " ++"rescan must be performed before another commit can be created.\n" ++"\n" ++"The rescan will be automatically started now.\n" ++msgstr "" ++"Det senaste inlästa tillstÃ¥ndet motsvarar inte tillstÃ¥ndet i arkivet.\n" ++"\n" ++"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du mÃ¥ste " ++"utföra en ny sökning innan du kan göra en ny incheckning.\n" ++"\n" ++"Sökningen kommer att startas automatiskt nu.\n" ++ ++#: lib/commit.tcl:182 ++#, tcl-format ++msgid "" ++"Unmerged files cannot be committed.\n" ++"\n" ++"File %s has merge conflicts. You must resolve them and stage the file " ++"before committing.\n" ++msgstr "" ++"Osammanslagna filer kan inte checkas in.\n" ++"\n" ++"Filen %s har sammanslagningskonflikter. Du mÃ¥ste lösa dem och köa filen " ++"innan du checkar in den.\n" ++ ++#: lib/commit.tcl:190 ++#, tcl-format ++msgid "" ++"Unknown file state %s detected.\n" ++"\n" ++"File %s cannot be committed by this program.\n" ++msgstr "" ++"Okänd filstatus %s upptäckt.\n" ++"\n" ++"Filen %s kan inte checkas in av programmet.\n" ++ ++#: lib/commit.tcl:198 ++msgid "" ++"No changes to commit.\n" ++"\n" ++"You must stage at least 1 file before you can commit.\n" ++msgstr "" ++"Inga ändringar att checka in.\n" ++"\n" ++"Du mÃ¥ste köa Ã¥tminstone en fil innan du kan checka in.\n" ++ ++#: lib/commit.tcl:213 ++msgid "" ++"Please supply a commit message.\n" ++"\n" ++"A good commit message has the following format:\n" ++"\n" ++"- First line: Describe in one sentence what you did.\n" ++"- Second line: Blank\n" ++"- Remaining lines: Describe why this change is good.\n" ++msgstr "" ++"Ange ett incheckningsmeddelande.\n" ++"\n" ++"Ett bra incheckningsmeddelande har följande format:\n" ++"\n" ++"- Första raden: Beskriv i en mening vad du gjorde.\n" ++"- Andra raden: Tom\n" ++"- Följande rader: Beskriv varför det här är en bra ändring.\n" ++ ++#: lib/commit.tcl:244 ++msgid "Calling pre-commit hook..." ++msgstr "Anropar kroken före incheckning (pre-commit)..." ++ ++#: lib/commit.tcl:259 ++msgid "Commit declined by pre-commit hook." ++msgstr "Incheckningen avvisades av kroken före incheckning (pre-commit)." ++ ++#: lib/commit.tcl:278 ++msgid "" ++"You are about to commit on a detached head. This is a potentially dangerous " ++"thing to do because if you switch to another branch you will lose your " ++"changes and it can be difficult to retrieve them later from the reflog. You " ++"should probably cancel this commit and create a new branch to continue.\n" ++" \n" ++" Do you really want to proceed with your Commit?" ++msgstr "" ++"Du är pÃ¥ väg att checka in pÃ¥ ett frÃ¥nkopplat huvud. Det kan potentiellt " ++"vara farligt, eftersom du kommer förlora dina ändringar om du växlar till en " ++"annan gren och det kan vara svÃ¥rt att hämta dem senare frÃ¥n ref-loggen. Du " ++"bör troligen avbryta incheckningen och skapa en ny gren för att fortsätta.\n" ++" \n" ++" Vill du verkligen fortsätta checka in?" ++ ++#: lib/commit.tcl:299 ++msgid "Calling commit-msg hook..." ++msgstr "Anropar kroken för incheckningsmeddelande (commit-msg)..." ++ ++#: lib/commit.tcl:314 ++msgid "Commit declined by commit-msg hook." ++msgstr "Incheckning avvisad av kroken för incheckningsmeddelande (commit-msg)." ++ ++#: lib/commit.tcl:327 ++msgid "Committing changes..." ++msgstr "Checkar in ändringar..." ++ ++#: lib/commit.tcl:344 ++msgid "write-tree failed:" ++msgstr "write-tree misslyckades:" ++ ++#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422 ++msgid "Commit failed." ++msgstr "Incheckningen misslyckades." ++ ++#: lib/commit.tcl:362 ++#, tcl-format ++msgid "Commit %s appears to be corrupt" ++msgstr "Incheckningen %s verkar vara trasig" ++ ++#: lib/commit.tcl:367 ++msgid "" ++"No changes to commit.\n" ++"\n" ++"No files were modified by this commit and it was not a merge commit.\n" ++"\n" ++"A rescan will be automatically started now.\n" ++msgstr "" ++"Inga ändringar att checka in.\n" ++"\n" ++"Inga filer ändrades av incheckningen och det var inte en sammanslagning.\n" ++"\n" ++"En sökning kommer att startas automatiskt nu.\n" ++ ++#: lib/commit.tcl:374 ++msgid "No changes to commit." ++msgstr "Inga ändringar att checka in." ++ ++#: lib/commit.tcl:394 ++msgid "commit-tree failed:" ++msgstr "commit-tree misslyckades:" ++ ++#: lib/commit.tcl:421 ++msgid "update-ref failed:" ++msgstr "update-ref misslyckades:" ++ ++#: lib/commit.tcl:515 ++#, tcl-format ++msgid "Created commit %s: %s" ++msgstr "Skapade incheckningen %s: %s" ++ ++#: lib/console.tcl:59 ++msgid "Working... please wait..." ++msgstr "Arbetar... vänta..." ++ ++#: lib/console.tcl:186 ++msgid "Success" ++msgstr "Lyckades" ++ ++#: lib/console.tcl:200 ++msgid "Error: Command Failed" ++msgstr "Fel: Kommando misslyckades" ++ ++#: lib/database.tcl:42 ++msgid "Number of loose objects" ++msgstr "Antal lösa objekt" ++ ++#: lib/database.tcl:43 ++msgid "Disk space used by loose objects" ++msgstr "Diskutrymme använt av lösa objekt" ++ ++#: lib/database.tcl:44 ++msgid "Number of packed objects" ++msgstr "Antal packade objekt" ++ ++#: lib/database.tcl:45 ++msgid "Number of packs" ++msgstr "Antal paket" ++ ++#: lib/database.tcl:46 ++msgid "Disk space used by packed objects" ++msgstr "Diskutrymme använt av packade objekt" ++ ++#: lib/database.tcl:47 ++msgid "Packed objects waiting for pruning" ++msgstr "Packade objekt som väntar pÃ¥ städning" ++ ++#: lib/database.tcl:48 ++msgid "Garbage files" ++msgstr "Skräpfiler" ++ ++#: lib/database.tcl:57 lib/option.tcl:182 lib/option.tcl:197 lib/option.tcl:220 ++#: lib/option.tcl:282 ++#, tcl-format ++msgid "%s:" ++msgstr "%s:" ++ ++#: lib/database.tcl:66 ++#, tcl-format ++msgid "%s (%s): Database Statistics" ++msgstr "%s (%s): Databasstatistik" ++ ++#: lib/database.tcl:72 ++msgid "Compressing the object database" ++msgstr "Komprimerar objektdatabasen" ++ ++#: lib/database.tcl:83 ++msgid "Verifying the object database with fsck-objects" ++msgstr "Verifierar objektdatabasen med fsck-objects" ++ ++#: lib/database.tcl:107 ++#, tcl-format ++msgid "" ++"This repository currently has approximately %i loose objects.\n" ++"\n" ++"To maintain optimal performance it is strongly recommended that you compress " ++"the database.\n" ++"\n" ++"Compress the database now?" ++msgstr "" ++"Arkivet har för närvarande omkring %i lösa objekt.\n" ++"\n" ++"För att bibehÃ¥lla optimal prestanda rekommenderas det Ã¥ det bestämdaste att " ++"du komprimerar databasen.\n" ++"\n" ++"Komprimera databasen nu?" ++ ++#: lib/date.tcl:25 ++#, tcl-format ++msgid "Invalid date from Git: %s" ++msgstr "Ogiltigt datum frÃ¥n Git: %s" ++ ++#: lib/diff.tcl:77 ++#, tcl-format ++msgid "" ++"No differences detected.\n" ++"\n" ++"%s has no changes.\n" ++"\n" +"The modification date of this file was updated by another application, but " +"the content within the file was not changed.\n" +"\n" +"A rescan will be automatically started to find other files which may have " +"the same state." +msgstr "" +"Hittade inga skillnader.\n" +"\n" +"%s innehÃ¥ller inga ändringar.\n" +"\n" +"Modifieringsdatum för filen uppdaterades av ett annat program, men " +"innehÃ¥llet i filen har inte ändrats.\n" +"\n" +"En sökning kommer automatiskt att startas för att hitta andra filer som kan " +"vara i samma tillstÃ¥nd." + +#: lib/diff.tcl:117 +#, tcl-format +msgid "Loading diff of %s..." +msgstr "Läser differens för %s..." + - #: lib/diff.tcl:140 ++#: lib/diff.tcl:143 +msgid "" +"LOCAL: deleted\n" +"REMOTE:\n" +msgstr "" +"LOKAL: borttagen\n" +"FJÄRR:\n" + - #: lib/diff.tcl:145 ++#: lib/diff.tcl:148 +msgid "" +"REMOTE: deleted\n" +"LOCAL:\n" +msgstr "" +"FJÄRR: borttagen\n" +"LOKAL:\n" + - #: lib/diff.tcl:152 ++#: lib/diff.tcl:155 +msgid "LOCAL:\n" +msgstr "LOKAL:\n" + - #: lib/diff.tcl:155 ++#: lib/diff.tcl:158 +msgid "REMOTE:\n" +msgstr "FJÄRR:\n" + - #: lib/diff.tcl:217 lib/diff.tcl:355 ++#: lib/diff.tcl:220 lib/diff.tcl:344 +#, tcl-format +msgid "Unable to display %s" +msgstr "Kan inte visa %s" + - #: lib/diff.tcl:218 ++#: lib/diff.tcl:221 +msgid "Error loading file:" +msgstr "Fel vid läsning av fil:" + - #: lib/diff.tcl:225 ++#: lib/diff.tcl:227 +msgid "Git Repository (subproject)" +msgstr "Gitarkiv (underprojekt)" + - #: lib/diff.tcl:237 ++#: lib/diff.tcl:239 +msgid "* Binary file (not showing content)." +msgstr "* Binärfil (visar inte innehÃ¥llet)." + - #: lib/diff.tcl:242 ++#: lib/diff.tcl:244 +#, tcl-format +msgid "" +"* Untracked file is %d bytes.\n" +"* Showing only first %d bytes.\n" +msgstr "" +"* Den ospÃ¥rade filen är %d byte.\n" +"* Visar endast inledande %d byte.\n" + - #: lib/diff.tcl:248 ++#: lib/diff.tcl:250 +#, tcl-format +msgid "" +"\n" +"* Untracked file clipped here by %s.\n" +"* To see the entire file, use an external editor.\n" +msgstr "" +"\n" +"* Den ospÃ¥rade filen klipptes här av %s.\n" +"* För att se hela filen, använd ett externt redigeringsprogram.\n" + - #: lib/diff.tcl:356 lib/blame.tcl:1128 - msgid "Error loading diff:" - msgstr "Fel vid inläsning av differens:" - - #: lib/diff.tcl:578 ++#: lib/diff.tcl:583 +msgid "Failed to unstage selected hunk." +msgstr "Kunde inte ta bort den valda delen frÃ¥n kön." + - #: lib/diff.tcl:585 ++#: lib/diff.tcl:591 ++msgid "Failed to revert selected hunk." ++msgstr "Kunde inte Ã¥terställa den valda delen." ++ ++#: lib/diff.tcl:594 +msgid "Failed to stage selected hunk." +msgstr "Kunde inte lägga till den valda delen till kön." + - #: lib/diff.tcl:664 - msgid "Failed to unstage selected line." - msgstr "Kunde inte ta bort den valda raden frÃ¥n kön." ++#: lib/diff.tcl:687 ++msgid "Failed to unstage selected line." ++msgstr "Kunde inte ta bort den valda raden frÃ¥n kön." ++ ++#: lib/diff.tcl:696 ++msgid "Failed to revert selected line." ++msgstr "Kunde inte Ã¥terställa den valda raden." ++ ++#: lib/diff.tcl:700 ++msgid "Failed to stage selected line." ++msgstr "Kunde inte lägga till den valda raden till kön." ++ ++#: lib/diff.tcl:889 ++msgid "Failed to undo last revert." ++msgstr "Kunde inte Ã¥ngra den senaste Ã¥terställningen." ++ ++#: lib/encoding.tcl:443 ++msgid "Default" ++msgstr "Standard" ++ ++#: lib/encoding.tcl:448 ++#, tcl-format ++msgid "System (%s)" ++msgstr "Systemets (%s)" ++ ++#: lib/encoding.tcl:459 lib/encoding.tcl:465 ++msgid "Other" ++msgstr "Annan" ++ ++#: lib/error.tcl:20 ++#, tcl-format ++msgid "%s: error" ++msgstr "%s: fel" ++ ++#: lib/error.tcl:36 ++#, tcl-format ++msgid "%s: warning" ++msgstr "%s: varning" ++ ++#: lib/error.tcl:80 ++#, tcl-format ++msgid "%s hook failed:" ++msgstr "%s-krok misslyckades:" ++ ++#: lib/error.tcl:96 ++msgid "You must correct the above errors before committing." ++msgstr "Du mÃ¥ste rätta till felen ovan innan du checkar in." + - #: lib/diff.tcl:672 - msgid "Failed to stage selected line." - msgstr "Kunde inte lägga till den valda raden till kön." ++#: lib/error.tcl:116 ++#, tcl-format ++msgid "%s (%s): error" ++msgstr "%s (%s): fel" + - #: lib/remote.tcl:200 - msgid "Push to" - msgstr "Sänd till" ++#: lib/index.tcl:6 ++msgid "Unable to unlock the index." ++msgstr "Kunde inte lÃ¥sa upp indexet." + - #: lib/remote.tcl:218 - msgid "Remove Remote" - msgstr "Ta bort fjärrarkiv" ++#: lib/index.tcl:30 ++msgid "Index Error" ++msgstr "Indexfel" + - #: lib/remote.tcl:223 - msgid "Prune from" - msgstr "Ta bort frÃ¥n" ++#: lib/index.tcl:32 ++msgid "" ++"Updating the Git index failed. A rescan will be automatically started to " ++"resynchronize git-gui." ++msgstr "" ++"Misslyckades med att uppdatera Gitindexet. En omsökning kommer att startas " ++"automatiskt för att synkronisera om git-gui." + - #: lib/remote.tcl:228 - msgid "Fetch from" - msgstr "Hämta frÃ¥n" ++#: lib/index.tcl:43 ++msgid "Continue" ++msgstr "Fortsätt" + - #: lib/choose_font.tcl:41 - msgid "Select" - msgstr "Välj" ++#: lib/index.tcl:46 ++msgid "Unlock Index" ++msgstr "LÃ¥s upp index" + - #: lib/choose_font.tcl:55 - msgid "Font Family" - msgstr "Teckensnittsfamilj" ++#: lib/index.tcl:326 ++msgid "Unstaging selected files from commit" ++msgstr "Tar bort valda filer frÃ¥n incheckningskön" + - #: lib/choose_font.tcl:76 - msgid "Font Size" - msgstr "Storlek" ++#: lib/index.tcl:330 ++#, tcl-format ++msgid "Unstaging %s from commit" ++msgstr "Tar bort %s frÃ¥n incheckningskön" + - #: lib/choose_font.tcl:93 - msgid "Font Example" - msgstr "Exempel" ++#: lib/index.tcl:369 ++msgid "Ready to commit." ++msgstr "Redo att checka in." + - #: lib/choose_font.tcl:105 - msgid "" - "This is example text.\n" - "If you like this text, it can be your font." - msgstr "" - "Detta är en exempeltext.\n" - "Om du tycker om den här texten kan den vara ditt teckensnitt." ++#: lib/index.tcl:378 ++msgid "Adding selected files" ++msgstr "Lägger till valda filer" + - #: lib/option.tcl:11 ++#: lib/index.tcl:382 +#, tcl-format - msgid "Invalid global encoding '%s'" - msgstr "Den globala teckenkodningen \"%s\" är ogiltig" ++msgid "Adding %s" ++msgstr "Lägger till %s" + - #: lib/option.tcl:19 ++#: lib/index.tcl:412 +#, tcl-format - msgid "Invalid repo encoding '%s'" - msgstr "Arkivets teckenkodning \"%s\" är ogiltig" ++msgid "Stage %d untracked files?" ++msgstr "Köa %d ospÃ¥rade filer?" + - #: lib/option.tcl:119 - msgid "Restore Defaults" - msgstr "Återställ standardvärden" ++#: lib/index.tcl:420 ++msgid "Adding all changed files" ++msgstr "Lägger till alla ändrade filer" + - #: lib/option.tcl:123 - msgid "Save" - msgstr "Spara" ++#: lib/index.tcl:503 ++#, tcl-format ++msgid "Revert changes in file %s?" ++msgstr "Återställ ändringarna i filen %s?" + - #: lib/option.tcl:133 ++#: lib/index.tcl:508 +#, tcl-format - msgid "%s Repository" - msgstr "Arkivet %s" ++msgid "Revert changes in these %i files?" ++msgstr "Återställ ändringarna i dessa %i filer?" + - #: lib/option.tcl:134 - msgid "Global (All Repositories)" - msgstr "Globalt (alla arkiv)" ++#: lib/index.tcl:517 ++msgid "Any unstaged changes will be permanently lost by the revert." ++msgstr "" ++"Alla oköade ändringar kommer permanent gÃ¥ förlorade vid Ã¥terställningen." + - #: lib/option.tcl:140 - msgid "User Name" - msgstr "Användarnamn" ++#: lib/index.tcl:520 lib/index.tcl:564 ++msgid "Do Nothing" ++msgstr "Gör ingenting" + - #: lib/option.tcl:141 - msgid "Email Address" - msgstr "E-postadress" ++#: lib/index.tcl:546 ++#, tcl-format ++msgid "Delete untracked file %s?" ++msgstr "Ta bort den ospÃ¥rade filen %s?" + - #: lib/option.tcl:143 - msgid "Summarize Merge Commits" - msgstr "Summera sammanslagningsincheckningar" ++#: lib/index.tcl:551 ++#, tcl-format ++msgid "Delete these %i untracked files?" ++msgstr "Ta bort dessa %i ospÃ¥rade filer?" + - #: lib/option.tcl:144 - msgid "Merge Verbosity" - msgstr "Pratsamhet för sammanslagningar" ++#: lib/index.tcl:561 ++msgid "Files will be permanently deleted." ++msgstr "Filerna kommer tas bort permanent." + - #: lib/option.tcl:145 - msgid "Show Diffstat After Merge" - msgstr "Visa diffstatistik efter sammanslagning" ++#: lib/index.tcl:565 ++msgid "Delete Files" ++msgstr "Ta bort filer" + - #: lib/option.tcl:146 - msgid "Use Merge Tool" - msgstr "Använd verktyg för sammanslagning" ++#: lib/index.tcl:588 ++msgid "Deleting" ++msgstr "Tar bort" + - #: lib/option.tcl:148 - msgid "Trust File Modification Timestamps" - msgstr "Lita pÃ¥ filändringstidsstämplar" ++#: lib/index.tcl:667 ++msgid "Encountered errors deleting files:\n" ++msgstr "Fel uppstod vid borttagning av filer:\n" + - #: lib/option.tcl:149 - msgid "Prune Tracking Branches During Fetch" - msgstr "Städa spÃ¥rade grenar vid hämtning" ++#: lib/index.tcl:676 ++#, tcl-format ++msgid "None of the %d selected files could be deleted." ++msgstr "Ingen av de %d valda filerna kunde tas bort." + - #: lib/option.tcl:150 - msgid "Match Tracking Branches" - msgstr "Matcha spÃ¥rade grenar" ++#: lib/index.tcl:681 ++#, tcl-format ++msgid "%d of the %d selected files could not be deleted." ++msgstr "%d av de %d valda filerna kunde inte tas bort." + - #: lib/option.tcl:151 - msgid "Use Textconv For Diffs and Blames" - msgstr "Använd Textconv för diff och klandring" ++#: lib/index.tcl:728 ++msgid "Reverting selected files" ++msgstr "Återställer valda filer" + - #: lib/option.tcl:152 - msgid "Blame Copy Only On Changed Files" - msgstr "Klandra kopiering bara i ändrade filer" ++#: lib/index.tcl:732 ++#, tcl-format ++msgid "Reverting %s" ++msgstr "Återställer %s" + - #: lib/option.tcl:153 - msgid "Maximum Length of Recent Repositories List" - msgstr "Max längd för lista över tidigare arkiv" ++#: lib/line.tcl:17 ++msgid "Goto Line:" ++msgstr "GÃ¥ till rad:" + - #: lib/option.tcl:154 - msgid "Minimum Letters To Blame Copy On" - msgstr "Minsta antal tecken att klandra kopiering för" ++#: lib/line.tcl:23 ++msgid "Go" ++msgstr "GÃ¥" + - #: lib/option.tcl:155 - msgid "Blame History Context Radius (days)" - msgstr "Historikradie för klandring (dagar)" ++#: lib/merge.tcl:13 ++msgid "" ++"Cannot merge while amending.\n" ++"\n" ++"You must finish amending this commit before starting any type of merge.\n" ++msgstr "" ++"Kan inte slÃ¥ ihop vid utökning.\n" ++"\n" ++"Du mÃ¥ste göra färdig utökningen av incheckningen innan du pÃ¥börjar nÃ¥gon " ++"slags sammanslagning.\n" + - #: lib/option.tcl:156 - msgid "Number of Diff Context Lines" - msgstr "Antal rader sammanhang i differenser" ++#: lib/merge.tcl:27 ++msgid "" ++"Last scanned state does not match repository state.\n" ++"\n" ++"Another Git program has modified this repository since the last scan. A " ++"rescan must be performed before a merge can be performed.\n" ++"\n" ++"The rescan will be automatically started now.\n" ++msgstr "" ++"Det senaste inlästa tillstÃ¥ndet motsvarar inte tillstÃ¥ndet i arkivet.\n" ++"\n" ++"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du mÃ¥ste " ++"utföra en ny sökning innan du kan utföra en sammanslagning.\n" ++"\n" ++"Sökningen kommer att startas automatiskt nu.\n" + - #: lib/option.tcl:157 - msgid "Additional Diff Parameters" - msgstr "Ytterligare diff-parametrar" ++#: lib/merge.tcl:45 ++#, tcl-format ++msgid "" ++"You are in the middle of a conflicted merge.\n" ++"\n" ++"File %s has merge conflicts.\n" ++"\n" ++"You must resolve them, stage the file, and commit to complete the current " ++"merge. Only then can you begin another merge.\n" ++msgstr "" ++"Du är mitt i en sammanslagning med konflikter.\n" ++"\n" ++"Filen %s har sammanslagningskonflikter.\n" ++"\n" ++"Du mÃ¥ste lösa dem, köa filen och checka in för att fullborda den aktuella " ++"sammanslagningen. När du gjort det kan du pÃ¥börja en ny sammanslagning.\n" + - #: lib/option.tcl:158 - msgid "Commit Message Text Width" - msgstr "Textbredd för incheckningsmeddelande" ++#: lib/merge.tcl:55 ++#, tcl-format ++msgid "" ++"You are in the middle of a change.\n" ++"\n" ++"File %s is modified.\n" ++"\n" ++"You should complete the current commit before starting a merge. Doing so " ++"will help you abort a failed merge, should the need arise.\n" ++msgstr "" ++"Du är mitt i en ändring.\n" ++"\n" ++"Filen %s har ändringar.\n" ++"\n" ++"Du bör fullborda den aktuella incheckningen innan du pÃ¥börjar en " ++"sammanslagning. Om du gör det blir det enklare att avbryta en misslyckad " ++"sammanslagning, om det skulle vara nödvändigt.\n" + - #: lib/option.tcl:159 - msgid "New Branch Name Template" - msgstr "Mall för namn pÃ¥ nya grenar" ++#: lib/merge.tcl:108 ++#, tcl-format ++msgid "%s of %s" ++msgstr "%s av %s" + - #: lib/option.tcl:160 - msgid "Default File Contents Encoding" - msgstr "Standardteckenkodning för filinnehÃ¥ll" ++#: lib/merge.tcl:126 ++#, tcl-format ++msgid "Merging %s and %s..." ++msgstr "SlÃ¥r ihop %s och %s..." + - #: lib/option.tcl:161 - msgid "Warn before committing to a detached head" - msgstr "Varna för incheckning pÃ¥ frÃ¥nkopplat huvud" ++#: lib/merge.tcl:137 ++msgid "Merge completed successfully." ++msgstr "Sammanslagningen avslutades framgÃ¥ngsrikt." + - #: lib/option.tcl:162 - msgid "Staging of untracked files" - msgstr "Köa ospÃ¥rade filer" ++#: lib/merge.tcl:139 ++msgid "Merge failed. Conflict resolution is required." ++msgstr "Sammanslagningen misslyckades. Du mÃ¥ste lösa konflikterna." + - #: lib/option.tcl:163 - msgid "Show untracked files" - msgstr "Visa ospÃ¥rade filer" ++#: lib/merge.tcl:156 ++#, tcl-format ++msgid "%s (%s): Merge" ++msgstr "%s (%s): Sammanslagning" + - #: lib/option.tcl:164 - msgid "Tab spacing" - msgstr "Blanksteg för tabulatortecken" ++#: lib/merge.tcl:164 ++#, tcl-format ++msgid "Merge Into %s" ++msgstr "SlÃ¥ ihop i %s" + - #: lib/option.tcl:210 - msgid "Change" - msgstr "Ändra" ++#: lib/merge.tcl:183 ++msgid "Revision To Merge" ++msgstr "Revisioner att slÃ¥ ihop" ++ ++#: lib/merge.tcl:218 ++msgid "" ++"Cannot abort while amending.\n" ++"\n" ++"You must finish amending this commit.\n" ++msgstr "" ++"Kan inte avbryta vid utökning.\n" ++"\n" ++"Du mÃ¥ste göra dig färdig med att utöka incheckningen.\n" + - #: lib/option.tcl:254 - msgid "Spelling Dictionary:" - msgstr "Stavningsordlista:" ++#: lib/merge.tcl:228 ++msgid "" ++"Abort merge?\n" ++"\n" ++"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" ++"\n" ++"Continue with aborting the current merge?" ++msgstr "" ++"Avbryt sammanslagning?\n" ++"\n" ++"Om du avbryter sammanslagningen kommer *ALLA* ej incheckade ändringar att gÃ¥ " ++"förlorade.\n" ++"\n" ++"GÃ¥ vidare med att avbryta den aktuella sammanslagningen?" + - #: lib/option.tcl:284 - msgid "Change Font" - msgstr "Byt teckensnitt" ++#: lib/merge.tcl:234 ++msgid "" ++"Reset changes?\n" ++"\n" ++"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" ++"\n" ++"Continue with resetting the current changes?" ++msgstr "" ++"Återställ ändringar?\n" ++"\n" ++"Om du Ã¥terställer ändringarna kommer *ALLA* ej incheckade ändringar att gÃ¥ " ++"förlorade.\n" ++"\n" ++"GÃ¥ vidare med att Ã¥terställa de aktuella ändringarna?" + - #: lib/option.tcl:288 - #, tcl-format - msgid "Choose %s" - msgstr "Välj %s" ++#: lib/merge.tcl:246 ++msgid "Aborting" ++msgstr "Avbryter" + - #: lib/option.tcl:294 - msgid "pt." - msgstr "p." ++#: lib/merge.tcl:247 ++msgid "files reset" ++msgstr "filer Ã¥terställda" + - #: lib/option.tcl:308 - msgid "Preferences" - msgstr "Inställningar" ++#: lib/merge.tcl:277 ++msgid "Abort failed." ++msgstr "Misslyckades avbryta." + - #: lib/option.tcl:345 - msgid "Failed to completely save options:" - msgstr "Misslyckades med att helt spara alternativ:" ++#: lib/merge.tcl:279 ++msgid "Abort completed. Ready." ++msgstr "Avbrytning fullbordad. Redo." + +#: lib/mergetool.tcl:8 +msgid "Force resolution to the base version?" +msgstr "Tvinga lösning att använda basversionen?" + +#: lib/mergetool.tcl:9 +msgid "Force resolution to this branch?" +msgstr "Tvinga lösning att använda den aktuella grenen?" + +#: lib/mergetool.tcl:10 +msgid "Force resolution to the other branch?" +msgstr "Tvinga lösning att använda den andra grenen?" + +#: lib/mergetool.tcl:14 +#, tcl-format +msgid "" +"Note that the diff shows only conflicting changes.\n" +"\n" +"%s will be overwritten.\n" +"\n" +"This operation can be undone only by restarting the merge." +msgstr "" +"Observera att diffen endast visar de ändringar som stÃ¥r i konflikt.\n" +"\n" +"%s kommer att skrivas över.\n" +"\n" +"Du mÃ¥ste starta om sammanslagningen för att göra den här operationen ogjord." + +#: lib/mergetool.tcl:45 +#, tcl-format +msgid "File %s seems to have unresolved conflicts, still stage?" +msgstr "Filen %s verkar innehÃ¥lla olösta konflikter. Vill du köa ändÃ¥?" + +#: lib/mergetool.tcl:60 +#, tcl-format +msgid "Adding resolution for %s" +msgstr "Lägger till lösning för %s" + +#: lib/mergetool.tcl:141 +msgid "Cannot resolve deletion or link conflicts using a tool" - msgstr "Kan inte lösa borttagnings- eller länkkonflikter med ett verktyg" - - #: lib/mergetool.tcl:146 - msgid "Conflict file does not exist" - msgstr "Konfliktfil existerar inte" - - #: lib/mergetool.tcl:246 - #, tcl-format - msgid "Not a GUI merge tool: '%s'" - msgstr "Inte ett grafiskt verktyg för sammanslagning: %s" - - #: lib/mergetool.tcl:275 - #, tcl-format - msgid "Unsupported merge tool '%s'" - msgstr "Verktyget \"%s\" för sammanslagning stöds inte" - - #: lib/mergetool.tcl:310 - msgid "Merge tool is already running, terminate it?" - msgstr "Verktyget för sammanslagning körs redan. Vill du avsluta det?" - - #: lib/mergetool.tcl:330 - #, tcl-format - msgid "" - "Error retrieving versions:\n" - "%s" - msgstr "" - "Fel vid hämtning av versioner:\n" - "%s" - - #: lib/mergetool.tcl:350 - #, tcl-format - msgid "" - "Could not start the merge tool:\n" - "\n" - "%s" - msgstr "" - "Kunde inte starta verktyg för sammanslagning:\n" - "\n" - "%s" - - #: lib/mergetool.tcl:354 - msgid "Running merge tool..." - msgstr "Kör verktyg för sammanslagning..." - - #: lib/mergetool.tcl:382 lib/mergetool.tcl:390 - msgid "Merge tool failed." - msgstr "Verktyget för sammanslagning misslyckades." - - #: lib/tools_dlg.tcl:22 - msgid "Add Tool" - msgstr "Lägg till verktyg" - - #: lib/tools_dlg.tcl:28 - msgid "Add New Tool Command" - msgstr "Lägg till nytt verktygskommando" - - #: lib/tools_dlg.tcl:34 - msgid "Add globally" - msgstr "Lägg till globalt" - - #: lib/tools_dlg.tcl:46 - msgid "Tool Details" - msgstr "Detaljer för verktyg" - - #: lib/tools_dlg.tcl:49 - msgid "Use '/' separators to create a submenu tree:" - msgstr "Använd \"/\"-avdelare för att skapa ett undermenyträd:" - - #: lib/tools_dlg.tcl:60 - msgid "Command:" - msgstr "Kommando:" - - #: lib/tools_dlg.tcl:71 - msgid "Show a dialog before running" - msgstr "Visa dialog innan programmet startas" - - #: lib/tools_dlg.tcl:77 - msgid "Ask the user to select a revision (sets $REVISION)" - msgstr "Be användaren välja en version (sätter $REVISION)" - - #: lib/tools_dlg.tcl:82 - msgid "Ask the user for additional arguments (sets $ARGS)" - msgstr "Be användaren om ytterligare parametrar (sätter $ARGS)" - - #: lib/tools_dlg.tcl:89 - msgid "Don't show the command output window" - msgstr "Visa inte kommandots utdatafönster" - - #: lib/tools_dlg.tcl:94 - msgid "Run only if a diff is selected ($FILENAME not empty)" - msgstr "Kör endast om en diff har markerats ($FILENAME är inte tomt)" - - #: lib/tools_dlg.tcl:118 - msgid "Please supply a name for the tool." - msgstr "Ange ett namn för verktyget." - - #: lib/tools_dlg.tcl:126 - #, tcl-format - msgid "Tool '%s' already exists." - msgstr "Verktyget \"%s\" finns redan." - - #: lib/tools_dlg.tcl:148 - #, tcl-format - msgid "" - "Could not add tool:\n" - "%s" - msgstr "" - "Kunde inte lägga till verktyget:\n" - "%s" - - #: lib/tools_dlg.tcl:187 - msgid "Remove Tool" - msgstr "Ta bort verktyg" - - #: lib/tools_dlg.tcl:193 - msgid "Remove Tool Commands" - msgstr "Ta bort verktygskommandon" - - #: lib/tools_dlg.tcl:198 - msgid "Remove" - msgstr "Ta bort" - - #: lib/tools_dlg.tcl:231 - msgid "(Blue denotes repository-local tools)" - msgstr "(BlÃ¥tt anger verktyg lokala för arkivet)" - - #: lib/tools_dlg.tcl:292 - #, tcl-format - msgid "Run Command: %s" - msgstr "Kör kommandot: %s" - - #: lib/tools_dlg.tcl:306 - msgid "Arguments" - msgstr "Argument" - - #: lib/tools_dlg.tcl:341 - msgid "OK" - msgstr "OK" - - #: lib/search.tcl:48 - msgid "Find:" - msgstr "Sök:" - - #: lib/search.tcl:50 - msgid "Next" - msgstr "Nästa" - - #: lib/search.tcl:51 - msgid "Prev" - msgstr "Föreg" - - #: lib/search.tcl:52 - msgid "RegExp" - msgstr "Reg.uttr." - - #: lib/search.tcl:54 - msgid "Case" - msgstr "Skiftläge" - - #: lib/branch_rename.tcl:15 lib/branch_rename.tcl:23 - msgid "Rename Branch" - msgstr "Byt namn pÃ¥ gren" - - #: lib/branch_rename.tcl:28 - msgid "Rename" - msgstr "Byt namn" - - #: lib/branch_rename.tcl:38 - msgid "Branch:" - msgstr "Gren:" - - #: lib/branch_rename.tcl:46 - msgid "New Name:" - msgstr "Nytt namn:" - - #: lib/branch_rename.tcl:81 - msgid "Please select a branch to rename." - msgstr "Välj en gren att byta namn pÃ¥." - - #: lib/branch_rename.tcl:92 lib/branch_create.tcl:154 - msgid "Please supply a branch name." - msgstr "Ange ett namn för grenen." - - #: lib/branch_rename.tcl:112 lib/branch_create.tcl:165 - #, tcl-format - msgid "'%s' is not an acceptable branch name." - msgstr "\"%s\" kan inte användas som namn pÃ¥ grenen." - - #: lib/branch_rename.tcl:123 - #, tcl-format - msgid "Failed to rename '%s'." - msgstr "Kunde inte byta namn pÃ¥ \"%s\"." - - #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 - msgid "Delete Branch Remotely" - msgstr "Ta bort gren frÃ¥n fjärrarkiv" - - #: lib/remote_branch_delete.tcl:48 - msgid "From Repository" - msgstr "FrÃ¥n arkiv" - - #: lib/remote_branch_delete.tcl:88 - msgid "Branches" - msgstr "Grenar" - - #: lib/remote_branch_delete.tcl:110 - msgid "Delete Only If" - msgstr "Ta endast bort om" - - #: lib/remote_branch_delete.tcl:112 - msgid "Merged Into:" - msgstr "Sammanslagen i:" ++msgstr "Kan inte lösa borttagnings- eller länkkonflikter med ett verktyg" + - #: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53 - msgid "Always (Do not perform merge checks)" - msgstr "Alltid (utför inte sammanslagningstest)" ++#: lib/mergetool.tcl:146 ++msgid "Conflict file does not exist" ++msgstr "Konfliktfil existerar inte" + - #: lib/remote_branch_delete.tcl:153 - msgid "A branch is required for 'Merged Into'." - msgstr "En gren krävs för \"Sammanslagen i\"." ++#: lib/mergetool.tcl:246 ++#, tcl-format ++msgid "Not a GUI merge tool: '%s'" ++msgstr "Inte ett grafiskt verktyg för sammanslagning: %s" + - #: lib/remote_branch_delete.tcl:185 ++#: lib/mergetool.tcl:275 +#, tcl-format - msgid "" - "The following branches are not completely merged into %s:\n" - "\n" - " - %s" - msgstr "" - "Följande grenar har inte helt slagits samman i %s:\n" - "\n" - " - %s" ++msgid "Unsupported merge tool '%s'" ++msgstr "Verktyget ”%s” för sammanslagning stöds inte" + - #: lib/remote_branch_delete.tcl:190 ++#: lib/mergetool.tcl:310 ++msgid "Merge tool is already running, terminate it?" ++msgstr "Verktyget för sammanslagning körs redan. Vill du avsluta det?" ++ ++#: lib/mergetool.tcl:330 +#, tcl-format +msgid "" - "One or more of the merge tests failed because you have not fetched the " - "necessary commits. Try fetching from %s first." ++"Error retrieving versions:\n" ++"%s" +msgstr "" - "En eller flera av sammanslagningstesterna misslyckades eftersom du inte har " - "hämtat de nödvändiga incheckningarna. Försök hämta frÃ¥n %s först." - - #: lib/remote_branch_delete.tcl:208 - msgid "Please select one or more branches to delete." - msgstr "Välj en eller flera grenar att ta bort." ++"Fel vid hämtning av versioner:\n" ++"%s" + - #: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115 ++#: lib/mergetool.tcl:350 ++#, tcl-format +msgid "" - "Recovering deleted branches is difficult.\n" ++"Could not start the merge tool:\n" +"\n" - "Delete the selected branches?" ++"%s" +msgstr "" - "Det kan vara svÃ¥rt att Ã¥terställa borttagna grenar.\n" ++"Kunde inte starta verktyg för sammanslagning:\n" +"\n" - "Ta bort de valda grenarna?" ++"%s" + - #: lib/remote_branch_delete.tcl:227 ++#: lib/mergetool.tcl:354 ++msgid "Running merge tool..." ++msgstr "Kör verktyg för sammanslagning..." ++ ++#: lib/mergetool.tcl:382 lib/mergetool.tcl:390 ++msgid "Merge tool failed." ++msgstr "Verktyget för sammanslagning misslyckades." ++ ++#: lib/option.tcl:11 +#, tcl-format - msgid "Deleting branches from %s" - msgstr "Tar bort grenar frÃ¥n %s" ++msgid "Invalid global encoding '%s'" ++msgstr "Den globala teckenkodningen ”%s” är ogiltig" + - #: lib/remote_branch_delete.tcl:300 - msgid "No repository selected." - msgstr "Inget arkiv markerat." ++#: lib/option.tcl:19 ++#, tcl-format ++msgid "Invalid repo encoding '%s'" ++msgstr "Arkivets teckenkodning ”%s” är ogiltig" + - #: lib/remote_branch_delete.tcl:305 ++#: lib/option.tcl:119 ++msgid "Restore Defaults" ++msgstr "Återställ standardvärden" ++ ++#: lib/option.tcl:123 ++msgid "Save" ++msgstr "Spara" ++ ++#: lib/option.tcl:133 +#, tcl-format - msgid "Scanning %s..." - msgstr "Söker %s..." ++msgid "%s Repository" ++msgstr "Arkivet %s" + - #: lib/choose_repository.tcl:33 - msgid "Git Gui" - msgstr "Git Gui" ++#: lib/option.tcl:134 ++msgid "Global (All Repositories)" ++msgstr "Globalt (alla arkiv)" + - #: lib/choose_repository.tcl:92 lib/choose_repository.tcl:412 - msgid "Create New Repository" - msgstr "Skapa nytt arkiv" ++#: lib/option.tcl:140 ++msgid "User Name" ++msgstr "Användarnamn" + - #: lib/choose_repository.tcl:98 - msgid "New..." - msgstr "Nytt..." ++#: lib/option.tcl:141 ++msgid "Email Address" ++msgstr "E-postadress" + - #: lib/choose_repository.tcl:105 lib/choose_repository.tcl:496 - msgid "Clone Existing Repository" - msgstr "Klona befintligt arkiv" ++#: lib/option.tcl:143 ++msgid "Summarize Merge Commits" ++msgstr "Summera sammanslagningsincheckningar" + - #: lib/choose_repository.tcl:116 - msgid "Clone..." - msgstr "Klona..." ++#: lib/option.tcl:144 ++msgid "Merge Verbosity" ++msgstr "Pratsamhet för sammanslagningar" + - #: lib/choose_repository.tcl:123 lib/choose_repository.tcl:1064 - msgid "Open Existing Repository" - msgstr "Öppna befintligt arkiv" ++#: lib/option.tcl:145 ++msgid "Show Diffstat After Merge" ++msgstr "Visa diffstatistik efter sammanslagning" + - #: lib/choose_repository.tcl:129 - msgid "Open..." - msgstr "Öppna..." ++#: lib/option.tcl:146 ++msgid "Use Merge Tool" ++msgstr "Använd verktyg för sammanslagning" + - #: lib/choose_repository.tcl:142 - msgid "Recent Repositories" - msgstr "Senaste arkiven" ++#: lib/option.tcl:148 ++msgid "Trust File Modification Timestamps" ++msgstr "Lita pÃ¥ filändringstidsstämplar" + - #: lib/choose_repository.tcl:148 - msgid "Open Recent Repository:" - msgstr "Öppna tidigare arkiv:" ++#: lib/option.tcl:149 ++msgid "Prune Tracking Branches During Fetch" ++msgstr "Städa spÃ¥rade grenar vid hämtning" + - #: lib/choose_repository.tcl:316 lib/choose_repository.tcl:323 - #: lib/choose_repository.tcl:330 - #, tcl-format - msgid "Failed to create repository %s:" - msgstr "Kunde inte skapa arkivet %s:" ++#: lib/option.tcl:150 ++msgid "Match Tracking Branches" ++msgstr "Matcha spÃ¥rade grenar" + - #: lib/choose_repository.tcl:407 lib/branch_create.tcl:33 - msgid "Create" - msgstr "Skapa" ++#: lib/option.tcl:151 ++msgid "Use Textconv For Diffs and Blames" ++msgstr "Använd Textconv för diff och klandring" + - #: lib/choose_repository.tcl:417 - msgid "Directory:" - msgstr "Katalog:" ++#: lib/option.tcl:152 ++msgid "Blame Copy Only On Changed Files" ++msgstr "Klandra kopiering bara i ändrade filer" + - #: lib/choose_repository.tcl:447 lib/choose_repository.tcl:573 - #: lib/choose_repository.tcl:1098 - msgid "Git Repository" - msgstr "Gitarkiv" ++#: lib/option.tcl:153 ++msgid "Maximum Length of Recent Repositories List" ++msgstr "Max längd för lista över tidigare arkiv" + - #: lib/choose_repository.tcl:472 - #, tcl-format - msgid "Directory %s already exists." - msgstr "Katalogen %s finns redan." ++#: lib/option.tcl:154 ++msgid "Minimum Letters To Blame Copy On" ++msgstr "Minsta antal tecken att klandra kopiering för" + - #: lib/choose_repository.tcl:476 - #, tcl-format - msgid "File %s already exists." - msgstr "Filen %s finns redan." ++#: lib/option.tcl:155 ++msgid "Blame History Context Radius (days)" ++msgstr "Historikradie för klandring (dagar)" + - #: lib/choose_repository.tcl:491 - msgid "Clone" - msgstr "Klona" ++#: lib/option.tcl:156 ++msgid "Number of Diff Context Lines" ++msgstr "Antal rader sammanhang i differenser" + - #: lib/choose_repository.tcl:504 - msgid "Source Location:" - msgstr "Plats för källkod:" ++#: lib/option.tcl:157 ++msgid "Additional Diff Parameters" ++msgstr "Ytterligare diff-parametrar" + - #: lib/choose_repository.tcl:513 - msgid "Target Directory:" - msgstr "MÃ¥lkatalog:" ++#: lib/option.tcl:158 ++msgid "Commit Message Text Width" ++msgstr "Textbredd för incheckningsmeddelande" + - #: lib/choose_repository.tcl:523 - msgid "Clone Type:" - msgstr "Typ av klon:" ++#: lib/option.tcl:159 ++msgid "New Branch Name Template" ++msgstr "Mall för namn pÃ¥ nya grenar" + - #: lib/choose_repository.tcl:528 - msgid "Standard (Fast, Semi-Redundant, Hardlinks)" - msgstr "Standard (snabb, semiredundant, hÃ¥rda länkar)" ++#: lib/option.tcl:160 ++msgid "Default File Contents Encoding" ++msgstr "Standardteckenkodning för filinnehÃ¥ll" + - #: lib/choose_repository.tcl:533 - msgid "Full Copy (Slower, Redundant Backup)" - msgstr "Full kopia (lÃ¥ngsammare, redundant säkerhetskopia)" ++#: lib/option.tcl:161 ++msgid "Warn before committing to a detached head" ++msgstr "Varna för incheckning pÃ¥ frÃ¥nkopplat huvud" + - #: lib/choose_repository.tcl:538 - msgid "Shared (Fastest, Not Recommended, No Backup)" - msgstr "Delad (snabbast, rekommenderas ej, ingen säkerhetskopia)" ++#: lib/option.tcl:162 ++msgid "Staging of untracked files" ++msgstr "Köa ospÃ¥rade filer" + - #: lib/choose_repository.tcl:545 - msgid "Recursively clone submodules too" - msgstr "Klona även rekursivt undermoduler" ++#: lib/option.tcl:163 ++msgid "Show untracked files" ++msgstr "Visa ospÃ¥rade filer" + - #: lib/choose_repository.tcl:579 lib/choose_repository.tcl:626 - #: lib/choose_repository.tcl:772 lib/choose_repository.tcl:842 - #: lib/choose_repository.tcl:1104 lib/choose_repository.tcl:1112 - #, tcl-format - msgid "Not a Git repository: %s" - msgstr "Inte ett Gitarkiv: %s" ++#: lib/option.tcl:164 ++msgid "Tab spacing" ++msgstr "Blanksteg för tabulatortecken" + - #: lib/choose_repository.tcl:615 - msgid "Standard only available for local repository." - msgstr "Standard är endast tillgängligt för lokala arkiv." ++#: lib/option.tcl:210 ++msgid "Change" ++msgstr "Ändra" + - #: lib/choose_repository.tcl:619 - msgid "Shared only available for local repository." - msgstr "Delat är endast tillgängligt för lokala arkiv." ++#: lib/option.tcl:254 ++msgid "Spelling Dictionary:" ++msgstr "Stavningsordlista:" ++ ++#: lib/option.tcl:284 ++msgid "Change Font" ++msgstr "Byt teckensnitt" + - #: lib/choose_repository.tcl:640 ++#: lib/option.tcl:288 +#, tcl-format - msgid "Location %s already exists." - msgstr "Platsen %s finns redan." ++msgid "Choose %s" ++msgstr "Välj %s" + - #: lib/choose_repository.tcl:651 - msgid "Failed to configure origin" - msgstr "Kunde inte konfigurera ursprung" ++#: lib/option.tcl:294 ++msgid "pt." ++msgstr "p." + - #: lib/choose_repository.tcl:663 - msgid "Counting objects" - msgstr "Räknar objekt" ++#: lib/option.tcl:308 ++msgid "Preferences" ++msgstr "Inställningar" + - #: lib/choose_repository.tcl:664 - msgid "buckets" - msgstr "hinkar" ++#: lib/option.tcl:345 ++msgid "Failed to completely save options:" ++msgstr "Misslyckades med att helt spara alternativ:" + - #: lib/choose_repository.tcl:688 ++#: lib/remote_add.tcl:20 +#, tcl-format - msgid "Unable to copy objects/info/alternates: %s" - msgstr "Kunde inte kopiera objekt/info/alternativ: %s" ++msgid "%s (%s): Add Remote" ++msgstr "%s (%s): Lägg till fjärrarkiv" + - #: lib/choose_repository.tcl:724 - #, tcl-format - msgid "Nothing to clone from %s." - msgstr "Ingenting att klona frÃ¥n %s." ++#: lib/remote_add.tcl:25 ++msgid "Add New Remote" ++msgstr "Lägg till nytt fjärrarkiv" + - #: lib/choose_repository.tcl:726 lib/choose_repository.tcl:940 - #: lib/choose_repository.tcl:952 - msgid "The 'master' branch has not been initialized." - msgstr "Grenen \"master\" har inte initierats." ++#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 ++msgid "Add" ++msgstr "Lägg till" + - #: lib/choose_repository.tcl:739 - msgid "Hardlinks are unavailable. Falling back to copying." - msgstr "HÃ¥rda länkar är inte tillgängliga. Faller tillbaka pÃ¥ kopiering." ++#: lib/remote_add.tcl:39 ++msgid "Remote Details" ++msgstr "Detaljer för fjärrarkiv" + - #: lib/choose_repository.tcl:751 - #, tcl-format - msgid "Cloning from %s" - msgstr "Klonar frÃ¥n %s" ++#: lib/remote_add.tcl:50 ++msgid "Location:" ++msgstr "Plats:" + - #: lib/choose_repository.tcl:782 - msgid "Copying objects" - msgstr "Kopierar objekt" ++#: lib/remote_add.tcl:60 ++msgid "Further Action" ++msgstr "Ytterligare Ã¥tgärd" + - #: lib/choose_repository.tcl:783 - msgid "KiB" - msgstr "KiB" ++#: lib/remote_add.tcl:63 ++msgid "Fetch Immediately" ++msgstr "Hämta omedelbart" + - #: lib/choose_repository.tcl:807 - #, tcl-format - msgid "Unable to copy object: %s" - msgstr "Kunde inte kopiera objekt: %s" ++#: lib/remote_add.tcl:69 ++msgid "Initialize Remote Repository and Push" ++msgstr "Initiera fjärrarkiv och sänd till" + - #: lib/choose_repository.tcl:817 - msgid "Linking objects" - msgstr "Länkar objekt" ++#: lib/remote_add.tcl:75 ++msgid "Do Nothing Else Now" ++msgstr "Gör ingent mer nu" + - #: lib/choose_repository.tcl:818 - msgid "objects" - msgstr "objekt" ++#: lib/remote_add.tcl:100 ++msgid "Please supply a remote name." ++msgstr "Ange ett namn för fjärrarkivet." + - #: lib/choose_repository.tcl:826 ++#: lib/remote_add.tcl:113 +#, tcl-format - msgid "Unable to hardlink object: %s" - msgstr "Kunde inte hÃ¥rdlänka objekt: %s" ++msgid "'%s' is not an acceptable remote name." ++msgstr "”%s” kan inte användas som namn pÃ¥ fjärrarkivet." + - #: lib/choose_repository.tcl:881 - msgid "Cannot fetch branches and objects. See console output for details." - msgstr "Kunde inte hämta grenar och objekt. Se konsolutdata för detaljer." ++#: lib/remote_add.tcl:124 ++#, tcl-format ++msgid "Failed to add remote '%s' of location '%s'." ++msgstr "Kunde inte lägga till fjärrarkivet ”%s” pÃ¥ platsen ”%s”." + - #: lib/choose_repository.tcl:892 - msgid "Cannot fetch tags. See console output for details." - msgstr "Kunde inte hämta taggar. Se konsolutdata för detaljer." ++#: lib/remote_add.tcl:132 lib/transport.tcl:6 ++#, tcl-format ++msgid "fetch %s" ++msgstr "hämta %s" + - #: lib/choose_repository.tcl:916 - msgid "Cannot determine HEAD. See console output for details." - msgstr "Kunde inte avgöra HEAD. Se konsolutdata för detaljer." ++#: lib/remote_add.tcl:133 ++#, tcl-format ++msgid "Fetching the %s" ++msgstr "Hämtar %s" + - #: lib/choose_repository.tcl:925 ++#: lib/remote_add.tcl:156 +#, tcl-format - msgid "Unable to cleanup %s" - msgstr "Kunde inte städa upp %s" ++msgid "Do not know how to initialize repository at location '%s'." ++msgstr "Vet inte hur arkivet pÃ¥ platsen ”%s” skall initieras." + - #: lib/choose_repository.tcl:931 - msgid "Clone failed." - msgstr "Kloning misslyckades." ++#: lib/remote_add.tcl:162 lib/transport.tcl:54 lib/transport.tcl:92 ++#: lib/transport.tcl:110 ++#, tcl-format ++msgid "push %s" ++msgstr "sänd %s" + - #: lib/choose_repository.tcl:938 - msgid "No default branch obtained." - msgstr "Hämtade ingen standardgren." ++#: lib/remote_add.tcl:163 ++#, tcl-format ++msgid "Setting up the %s (at %s)" ++msgstr "Konfigurerar %s (pÃ¥ %s)" + - #: lib/choose_repository.tcl:949 ++#: lib/remote_branch_delete.tcl:29 +#, tcl-format - msgid "Cannot resolve %s as a commit." - msgstr "Kunde inte slÃ¥ upp %s till nÃ¥gon incheckning." ++msgid "%s (%s): Delete Branch Remotely" ++msgstr "%s (%s): Ta bort gren frÃ¥n fjärrarkiv" + - #: lib/choose_repository.tcl:961 - msgid "Creating working directory" - msgstr "Skapar arbetskatalog" ++#: lib/remote_branch_delete.tcl:34 ++msgid "Delete Branch Remotely" ++msgstr "Ta bort gren frÃ¥n fjärrarkiv" + - #: lib/choose_repository.tcl:962 lib/index.tcl:70 lib/index.tcl:136 - #: lib/index.tcl:207 - msgid "files" - msgstr "filer" ++#: lib/remote_branch_delete.tcl:48 ++msgid "From Repository" ++msgstr "FrÃ¥n arkiv" + - #: lib/choose_repository.tcl:981 - msgid "Cannot clone submodules." - msgstr "Kan inte klona undermoduler." ++#: lib/remote_branch_delete.tcl:51 lib/transport.tcl:165 ++msgid "Remote:" ++msgstr "Fjärrarkiv:" + - #: lib/choose_repository.tcl:990 - msgid "Cloning submodules" - msgstr "Klonar undermoduler" ++#: lib/remote_branch_delete.tcl:72 lib/transport.tcl:187 ++msgid "Arbitrary Location:" ++msgstr "Godtycklig plats:" + - #: lib/choose_repository.tcl:1015 - msgid "Initial file checkout failed." - msgstr "Inledande filutcheckning misslyckades." ++#: lib/remote_branch_delete.tcl:88 ++msgid "Branches" ++msgstr "Grenar" + - #: lib/choose_repository.tcl:1059 - msgid "Open" - msgstr "Öppna" ++#: lib/remote_branch_delete.tcl:110 ++msgid "Delete Only If" ++msgstr "Ta endast bort om" + - #: lib/choose_repository.tcl:1069 - msgid "Repository:" - msgstr "Arkiv:" ++#: lib/remote_branch_delete.tcl:112 ++msgid "Merged Into:" ++msgstr "Sammanslagen i:" ++ ++#: lib/remote_branch_delete.tcl:153 ++msgid "A branch is required for 'Merged Into'." ++msgstr "En gren krävs för ”Sammanslagen i”." + - #: lib/choose_repository.tcl:1118 ++#: lib/remote_branch_delete.tcl:185 +#, tcl-format - msgid "Failed to open repository %s:" - msgstr "Kunde inte öppna arkivet %s:" ++msgid "" ++"The following branches are not completely merged into %s:\n" ++"\n" ++" - %s" ++msgstr "" ++"Följande grenar har inte helt slagits samman i %s:\n" ++"\n" ++" - %s" + - #: lib/about.tcl:26 - msgid "git-gui - a graphical user interface for Git." - msgstr "git-gui - ett grafiskt användargränssnitt för Git." ++#: lib/remote_branch_delete.tcl:190 ++#, tcl-format ++msgid "" ++"One or more of the merge tests failed because you have not fetched the " ++"necessary commits. Try fetching from %s first." ++msgstr "" ++"En eller flera av sammanslagningstesterna misslyckades eftersom du inte har " ++"hämtat de nödvändiga incheckningarna. Försök hämta frÃ¥n %s först." + - #: lib/blame.tcl:73 - msgid "File Viewer" - msgstr "Filvisare" ++#: lib/remote_branch_delete.tcl:208 ++msgid "Please select one or more branches to delete." ++msgstr "Välj en eller flera grenar att ta bort." + - #: lib/blame.tcl:79 - msgid "Commit:" - msgstr "Incheckning:" ++#: lib/remote_branch_delete.tcl:227 ++#, tcl-format ++msgid "Deleting branches from %s" ++msgstr "Tar bort grenar frÃ¥n %s" + - #: lib/blame.tcl:280 - msgid "Copy Commit" - msgstr "Kopiera incheckning" ++#: lib/remote_branch_delete.tcl:300 ++msgid "No repository selected." ++msgstr "Inget arkiv markerat." + - #: lib/blame.tcl:284 - msgid "Find Text..." - msgstr "Sök text..." ++#: lib/remote_branch_delete.tcl:305 ++#, tcl-format ++msgid "Scanning %s..." ++msgstr "Söker %s..." + - #: lib/blame.tcl:288 - msgid "Goto Line..." - msgstr "GÃ¥ till rad..." ++#: lib/remote.tcl:200 ++msgid "Push to" ++msgstr "Sänd till" + - #: lib/blame.tcl:297 - msgid "Do Full Copy Detection" - msgstr "Gör full kopieringsigenkänning" ++#: lib/remote.tcl:218 ++msgid "Remove Remote" ++msgstr "Ta bort fjärrarkiv" + - #: lib/blame.tcl:301 - msgid "Show History Context" - msgstr "Visa historiksammanhang" ++#: lib/remote.tcl:223 ++msgid "Prune from" ++msgstr "Ta bort frÃ¥n" + - #: lib/blame.tcl:304 - msgid "Blame Parent Commit" - msgstr "Klandra föräldraincheckning" ++#: lib/remote.tcl:228 ++msgid "Fetch from" ++msgstr "Hämta frÃ¥n" + - #: lib/blame.tcl:466 - #, tcl-format - msgid "Reading %s..." - msgstr "Läser %s..." ++#: lib/remote.tcl:249 lib/remote.tcl:253 lib/remote.tcl:258 lib/remote.tcl:264 ++msgid "All" ++msgstr "Alla" + - #: lib/blame.tcl:594 - msgid "Loading copy/move tracking annotations..." - msgstr "Läser annoteringar för kopiering/flyttning..." ++#: lib/search.tcl:48 ++msgid "Find:" ++msgstr "Sök:" + - #: lib/blame.tcl:614 - msgid "lines annotated" - msgstr "rader annoterade" ++#: lib/search.tcl:50 ++msgid "Next" ++msgstr "Nästa" + - #: lib/blame.tcl:806 - msgid "Loading original location annotations..." - msgstr "Läser in annotering av originalplacering..." ++#: lib/search.tcl:51 ++msgid "Prev" ++msgstr "Föreg" + - #: lib/blame.tcl:809 - msgid "Annotation complete." - msgstr "Annotering fullbordad." ++#: lib/search.tcl:52 ++msgid "RegExp" ++msgstr "Reg.uttr." + - #: lib/blame.tcl:839 - msgid "Busy" - msgstr "Upptagen" ++#: lib/search.tcl:54 ++msgid "Case" ++msgstr "Skiftläge" + - #: lib/blame.tcl:840 - msgid "Annotation process is already running." - msgstr "Annoteringsprocess körs redan." ++#: lib/shortcut.tcl:8 lib/shortcut.tcl:40 lib/shortcut.tcl:72 ++#, tcl-format ++msgid "%s (%s): Create Desktop Icon" ++msgstr "%s (%s): Skapa skrivbordsikon" + - #: lib/blame.tcl:879 - msgid "Running thorough copy detection..." - msgstr "Kör grundlig kopieringsigenkänning..." ++#: lib/shortcut.tcl:24 lib/shortcut.tcl:62 ++msgid "Cannot write shortcut:" ++msgstr "Kan inte skriva genväg:" + - #: lib/blame.tcl:947 - msgid "Loading annotation..." - msgstr "Läser in annotering..." ++#: lib/shortcut.tcl:137 ++msgid "Cannot write icon:" ++msgstr "Kan inte skriva ikon:" + - #: lib/blame.tcl:1000 - msgid "Author:" - msgstr "Författare:" ++#: lib/spellcheck.tcl:57 ++msgid "Unsupported spell checker" ++msgstr "Stavningskontrollprogrammet stöds inte" + - #: lib/blame.tcl:1004 - msgid "Committer:" - msgstr "Incheckare:" ++#: lib/spellcheck.tcl:65 ++msgid "Spell checking is unavailable" ++msgstr "Stavningskontroll är ej tillgänglig" + - #: lib/blame.tcl:1009 - msgid "Original File:" - msgstr "Ursprunglig fil:" ++#: lib/spellcheck.tcl:68 ++msgid "Invalid spell checking configuration" ++msgstr "Ogiltig inställning för stavningskontroll" + - #: lib/blame.tcl:1057 - msgid "Cannot find HEAD commit:" - msgstr "Hittar inte incheckning för HEAD:" ++#: lib/spellcheck.tcl:70 ++#, tcl-format ++msgid "Reverting dictionary to %s." ++msgstr "Återställer ordlistan till %s." + - #: lib/blame.tcl:1112 - msgid "Cannot find parent commit:" - msgstr "Hittar inte föräldraincheckning:" ++#: lib/spellcheck.tcl:73 ++msgid "Spell checker silently failed on startup" ++msgstr "Stavningskontroll misslyckades tyst vid start" + - #: lib/blame.tcl:1127 - msgid "Unable to display parent" - msgstr "Kan inte visa förälder" ++#: lib/spellcheck.tcl:80 ++msgid "Unrecognized spell checker" ++msgstr "Stavningskontrollprogrammet känns inte igen" + - #: lib/blame.tcl:1269 - msgid "Originally By:" - msgstr "Ursprungligen av:" ++#: lib/spellcheck.tcl:186 ++msgid "No Suggestions" ++msgstr "Inga förslag" + - #: lib/blame.tcl:1275 - msgid "In File:" - msgstr "I filen:" ++#: lib/spellcheck.tcl:388 ++msgid "Unexpected EOF from spell checker" ++msgstr "Oväntat filslut frÃ¥n stavningskontroll" + - #: lib/blame.tcl:1280 - msgid "Copied Or Moved Here By:" - msgstr "Kopierad eller flyttad hit av:" ++#: lib/spellcheck.tcl:392 ++msgid "Spell Checker Failed" ++msgstr "Stavningskontroll misslyckades" + - #: lib/sshkey.tcl:31 ++#: lib/sshkey.tcl:34 +msgid "No keys found." +msgstr "Inga nycklar hittades." + - #: lib/sshkey.tcl:34 ++#: lib/sshkey.tcl:37 +#, tcl-format +msgid "Found a public key in: %s" +msgstr "Hittade öppen nyckel i: %s" + - #: lib/sshkey.tcl:40 ++#: lib/sshkey.tcl:43 +msgid "Generate Key" +msgstr "Skapa nyckel" + - #: lib/sshkey.tcl:58 ++#: lib/sshkey.tcl:61 +msgid "Copy To Clipboard" +msgstr "Kopiera till Urklipp" + - #: lib/sshkey.tcl:72 ++#: lib/sshkey.tcl:75 +msgid "Your OpenSSH Public Key" +msgstr "Din öppna OpenSSH-nyckel" + - #: lib/sshkey.tcl:80 ++#: lib/sshkey.tcl:83 +msgid "Generating..." +msgstr "Skapar..." + - #: lib/sshkey.tcl:86 ++#: lib/sshkey.tcl:89 +#, tcl-format +msgid "" +"Could not start ssh-keygen:\n" +"\n" +"%s" +msgstr "" +"Kunde inte starta ssh-keygen:\n" +"\n" +"%s" + - #: lib/sshkey.tcl:113 ++#: lib/sshkey.tcl:116 +msgid "Generation failed." +msgstr "Misslyckades med att skapa." + - #: lib/sshkey.tcl:120 ++#: lib/sshkey.tcl:123 +msgid "Generation succeeded, but no keys found." +msgstr "Lyckades skapa nyckeln, men hittar inte nÃ¥gon nyckel." + - #: lib/sshkey.tcl:123 ++#: lib/sshkey.tcl:126 +#, tcl-format +msgid "Your key is in: %s" +msgstr "Din nyckel finns i: %s" + - #: lib/branch_create.tcl:23 - msgid "Create Branch" - msgstr "Skapa gren" - - #: lib/branch_create.tcl:28 - msgid "Create New Branch" - msgstr "Skapa ny gren" - - #: lib/branch_create.tcl:42 - msgid "Branch Name" - msgstr "Namn pÃ¥ gren" - - #: lib/branch_create.tcl:57 - msgid "Match Tracking Branch Name" - msgstr "Använd namn pÃ¥ spÃ¥rad gren" - - #: lib/branch_create.tcl:66 - msgid "Starting Revision" - msgstr "Inledande revision" - - #: lib/branch_create.tcl:72 - msgid "Update Existing Branch:" - msgstr "Uppdatera befintlig gren:" - - #: lib/branch_create.tcl:75 - msgid "No" - msgstr "Nej" - - #: lib/branch_create.tcl:80 - msgid "Fast Forward Only" - msgstr "Endast snabbspolning" - - #: lib/branch_create.tcl:97 - msgid "Checkout After Creation" - msgstr "Checka ut när skapad" - - #: lib/branch_create.tcl:132 - msgid "Please select a tracking branch." - msgstr "Välj en gren att spÃ¥ra." - - #: lib/branch_create.tcl:141 - #, tcl-format - msgid "Tracking branch %s is not a branch in the remote repository." - msgstr "Den spÃ¥rade grenen %s är inte en gren i fjärrarkivet." - - #: lib/shortcut.tcl:21 lib/shortcut.tcl:62 - msgid "Cannot write shortcut:" - msgstr "Kan inte skriva genväg:" - - #: lib/shortcut.tcl:137 - msgid "Cannot write icon:" - msgstr "Kan inte skriva ikon:" - - #: lib/choose_rev.tcl:52 - msgid "This Detached Checkout" - msgstr "Denna frÃ¥nkopplade utcheckning" - - #: lib/choose_rev.tcl:60 - msgid "Revision Expression:" - msgstr "Revisionsuttryck:" - - #: lib/choose_rev.tcl:72 - msgid "Local Branch" - msgstr "Lokal gren" - - #: lib/choose_rev.tcl:77 - msgid "Tracking Branch" - msgstr "SpÃ¥rande gren" - - #: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 - msgid "Tag" - msgstr "Tagg" - - #: lib/choose_rev.tcl:321 - #, tcl-format - msgid "Invalid revision: %s" - msgstr "Ogiltig revision: %s" - - #: lib/choose_rev.tcl:342 - msgid "No revision selected." - msgstr "Ingen revision vald." - - #: lib/choose_rev.tcl:350 - msgid "Revision expression is empty." - msgstr "Revisionsuttrycket är tomt." - - #: lib/choose_rev.tcl:537 - msgid "Updated" - msgstr "Uppdaterad" - - #: lib/choose_rev.tcl:565 - msgid "URL" - msgstr "Webbadress" - - #: lib/commit.tcl:9 - msgid "" - "There is nothing to amend.\n" - "\n" - "You are about to create the initial commit. There is no commit before this " - "to amend.\n" - msgstr "" - "Det finns ingenting att utöka.\n" - "\n" - "Du hÃ¥ller pÃ¥ att skapa den inledande incheckningen. Det finns ingen tidigare " - "incheckning att utöka.\n" - - #: lib/commit.tcl:18 - msgid "" - "Cannot amend while merging.\n" - "\n" - "You are currently in the middle of a merge that has not been fully " - "completed. You cannot amend the prior commit unless you first abort the " - "current merge activity.\n" - msgstr "" - "Kan inte utöka vid sammanslagning.\n" - "\n" - "Du är i mitten av en sammanslagning som inte är fullbordad. Du kan inte " - "utöka tidigare incheckningar om du inte först avbryter den pÃ¥gÃ¥ende " - "sammanslagningen.\n" - - #: lib/commit.tcl:48 - msgid "Error loading commit data for amend:" - msgstr "Fel vid inläsning av incheckningsdata för utökning:" - - #: lib/commit.tcl:75 - msgid "Unable to obtain your identity:" - msgstr "Kunde inte hämta din identitet:" - - #: lib/commit.tcl:80 - msgid "Invalid GIT_COMMITTER_IDENT:" - msgstr "Felaktig GIT_COMMITTER_IDENT:" - - #: lib/commit.tcl:129 - #, tcl-format - msgid "warning: Tcl does not support encoding '%s'." - msgstr "varning: Tcl stöder inte teckenkodningen \"%s\"." - - #: lib/commit.tcl:149 - msgid "" - "Last scanned state does not match repository state.\n" - "\n" - "Another Git program has modified this repository since the last scan. A " - "rescan must be performed before another commit can be created.\n" - "\n" - "The rescan will be automatically started now.\n" - msgstr "" - "Det senaste inlästa tillstÃ¥ndet motsvarar inte tillstÃ¥ndet i arkivet.\n" - "\n" - "Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du mÃ¥ste " - "utföra en ny sökning innan du kan göra en ny incheckning.\n" - "\n" - "Sökningen kommer att startas automatiskt nu.\n" - - #: lib/commit.tcl:173 ++#: lib/status_bar.tcl:263 +#, tcl-format - msgid "" - "Unmerged files cannot be committed.\n" - "\n" - "File %s has merge conflicts. You must resolve them and stage the file " - "before committing.\n" - msgstr "" - "Osammanslagna filer kan inte checkas in.\n" - "\n" - "Filen %s har sammanslagningskonflikter. Du mÃ¥ste lösa dem och köa filen " - "innan du checkar in den.\n" ++msgid "%s ... %*i of %*i %s (%3i%%)" ++msgstr "%s... %*i av %*i %s (%3i%%)" + - #: lib/commit.tcl:181 ++#: lib/tools_dlg.tcl:22 +#, tcl-format - msgid "" - "Unknown file state %s detected.\n" - "\n" - "File %s cannot be committed by this program.\n" - msgstr "" - "Okänd filstatus %s upptäckt.\n" - "\n" - "Filen %s kan inte checkas in av programmet.\n" - - #: lib/commit.tcl:189 - msgid "" - "No changes to commit.\n" - "\n" - "You must stage at least 1 file before you can commit.\n" - msgstr "" - "Inga ändringar att checka in.\n" - "\n" - "Du mÃ¥ste köa Ã¥tminstone en fil innan du kan checka in.\n" - - #: lib/commit.tcl:204 - msgid "" - "Please supply a commit message.\n" - "\n" - "A good commit message has the following format:\n" - "\n" - "- First line: Describe in one sentence what you did.\n" - "- Second line: Blank\n" - "- Remaining lines: Describe why this change is good.\n" - msgstr "" - "Ange ett incheckningsmeddelande.\n" - "\n" - "Ett bra incheckningsmeddelande har följande format:\n" - "\n" - "- Första raden: Beskriv i en mening vad du gjorde.\n" - "- Andra raden: Tom\n" - "- Följande rader: Beskriv varför det här är en bra ändring.\n" - - #: lib/commit.tcl:235 - msgid "Calling pre-commit hook..." - msgstr "Anropar kroken före incheckning (pre-commit)..." - - #: lib/commit.tcl:250 - msgid "Commit declined by pre-commit hook." - msgstr "Incheckningen avvisades av kroken före incheckning (pre-commit)." - - #: lib/commit.tcl:269 - msgid "" - "You are about to commit on a detached head. This is a potentially dangerous " - "thing to do because if you switch to another branch you will lose your " - "changes and it can be difficult to retrieve them later from the reflog. You " - "should probably cancel this commit and create a new branch to continue.\n" - " \n" - " Do you really want to proceed with your Commit?" - msgstr "" - "Du är pÃ¥ väg att checka in pÃ¥ ett frÃ¥nkopplat huvud. Det kan potentiellt " - "vara farligt, eftersom du kommer förlora dina ändringar om du växlar till en " - "annan gren och det kan vara svÃ¥rt att hämta dem senare frÃ¥n ref-loggen. Du " - "bör troligen avbryta incheckningen och skapa en ny gren för att fortsätta.\n" - " \n" - " Vill du verkligen fortsätta checka in?" - - #: lib/commit.tcl:290 - msgid "Calling commit-msg hook..." - msgstr "Anropar kroken för incheckningsmeddelande (commit-msg)..." - - #: lib/commit.tcl:305 - msgid "Commit declined by commit-msg hook." - msgstr "Incheckning avvisad av kroken för incheckningsmeddelande (commit-msg)." - - #: lib/commit.tcl:318 - msgid "Committing changes..." - msgstr "Checkar in ändringar..." ++msgid "%s (%s): Add Tool" ++msgstr "%s (%s): Lägg till verktyg" + - #: lib/commit.tcl:334 - msgid "write-tree failed:" - msgstr "write-tree misslyckades:" - - #: lib/commit.tcl:335 lib/commit.tcl:379 lib/commit.tcl:400 - msgid "Commit failed." - msgstr "Incheckningen misslyckades." - - #: lib/commit.tcl:352 - #, tcl-format - msgid "Commit %s appears to be corrupt" - msgstr "Incheckningen %s verkar vara trasig" ++#: lib/tools_dlg.tcl:28 ++msgid "Add New Tool Command" ++msgstr "Lägg till nytt verktygskommando" + - #: lib/commit.tcl:357 - msgid "" - "No changes to commit.\n" - "\n" - "No files were modified by this commit and it was not a merge commit.\n" - "\n" - "A rescan will be automatically started now.\n" - msgstr "" - "Inga ändringar att checka in.\n" - "\n" - "Inga filer ändrades av incheckningen och det var inte en sammanslagning.\n" - "\n" - "En sökning kommer att startas automatiskt nu.\n" ++#: lib/tools_dlg.tcl:34 ++msgid "Add globally" ++msgstr "Lägg till globalt" + - #: lib/commit.tcl:364 - msgid "No changes to commit." - msgstr "Inga ändringar att checka in." ++#: lib/tools_dlg.tcl:46 ++msgid "Tool Details" ++msgstr "Detaljer för verktyg" + - #: lib/commit.tcl:378 - msgid "commit-tree failed:" - msgstr "commit-tree misslyckades:" ++#: lib/tools_dlg.tcl:49 ++msgid "Use '/' separators to create a submenu tree:" ++msgstr "Använd ”/”-avdelare för att skapa ett undermenyträd:" + - #: lib/commit.tcl:399 - msgid "update-ref failed:" - msgstr "update-ref misslyckades:" ++#: lib/tools_dlg.tcl:60 ++msgid "Command:" ++msgstr "Kommando:" + - #: lib/commit.tcl:492 - #, tcl-format - msgid "Created commit %s: %s" - msgstr "Skapade incheckningen %s: %s" ++#: lib/tools_dlg.tcl:71 ++msgid "Show a dialog before running" ++msgstr "Visa dialog innan programmet startas" + - #: lib/branch_delete.tcl:16 - msgid "Delete Branch" - msgstr "Ta bort gren" ++#: lib/tools_dlg.tcl:77 ++msgid "Ask the user to select a revision (sets $REVISION)" ++msgstr "Be användaren välja en version (sätter $REVISION)" + - #: lib/branch_delete.tcl:21 - msgid "Delete Local Branch" - msgstr "Ta bort lokal gren" ++#: lib/tools_dlg.tcl:82 ++msgid "Ask the user for additional arguments (sets $ARGS)" ++msgstr "Be användaren om ytterligare parametrar (sätter $ARGS)" + - #: lib/branch_delete.tcl:39 - msgid "Local Branches" - msgstr "Lokala grenar" ++#: lib/tools_dlg.tcl:89 ++msgid "Don't show the command output window" ++msgstr "Visa inte kommandots utdatafönster" + - #: lib/branch_delete.tcl:51 - msgid "Delete Only If Merged Into" - msgstr "Ta bara bort om sammanslagen med" ++#: lib/tools_dlg.tcl:94 ++msgid "Run only if a diff is selected ($FILENAME not empty)" ++msgstr "Kör endast om en diff har markerats ($FILENAME är inte tomt)" + - #: lib/branch_delete.tcl:103 ++#: lib/tools_dlg.tcl:118 ++msgid "Please supply a name for the tool." ++msgstr "Ange ett namn för verktyget." ++ ++#: lib/tools_dlg.tcl:126 +#, tcl-format - msgid "The following branches are not completely merged into %s:" - msgstr "Följande grenar är inte till fullo sammanslagna med %s:" ++msgid "Tool '%s' already exists." ++msgstr "Verktyget ”%s” finns redan." + - #: lib/branch_delete.tcl:141 ++#: lib/tools_dlg.tcl:148 +#, tcl-format +msgid "" - "Failed to delete branches:\n" ++"Could not add tool:\n" +"%s" +msgstr "" - "Kunde inte ta bort grenar:\n" ++"Kunde inte lägga till verktyget:\n" +"%s" + - #: lib/index.tcl:6 - msgid "Unable to unlock the index." - msgstr "Kunde inte lÃ¥sa upp indexet." ++#: lib/tools_dlg.tcl:187 ++#, tcl-format ++msgid "%s (%s): Remove Tool" ++msgstr "%s (%s): Ta bort verktyg" + - #: lib/index.tcl:17 - msgid "Index Error" - msgstr "Indexfel" ++#: lib/tools_dlg.tcl:193 ++msgid "Remove Tool Commands" ++msgstr "Ta bort verktygskommandon" + - #: lib/index.tcl:19 - msgid "" - "Updating the Git index failed. A rescan will be automatically started to " - "resynchronize git-gui." - msgstr "" - "Misslyckades med att uppdatera Gitindexet. En omsökning kommer att startas " - "automatiskt för att synkronisera om git-gui." ++#: lib/tools_dlg.tcl:198 ++msgid "Remove" ++msgstr "Ta bort" + - #: lib/index.tcl:30 - msgid "Continue" - msgstr "Fortsätt" ++#: lib/tools_dlg.tcl:231 ++msgid "(Blue denotes repository-local tools)" ++msgstr "(BlÃ¥tt anger verktyg lokala för arkivet)" + - #: lib/index.tcl:33 - msgid "Unlock Index" - msgstr "LÃ¥s upp index" ++#: lib/tools_dlg.tcl:283 ++#, tcl-format ++msgid "%s (%s):" ++msgstr "%s (%s):" + - #: lib/index.tcl:298 ++#: lib/tools_dlg.tcl:292 +#, tcl-format - msgid "Unstaging %s from commit" - msgstr "Tar bort %s för incheckningskön" ++msgid "Run Command: %s" ++msgstr "Kör kommandot: %s" + - #: lib/index.tcl:337 - msgid "Ready to commit." - msgstr "Redo att checka in." ++#: lib/tools_dlg.tcl:306 ++msgid "Arguments" ++msgstr "Argument" + - #: lib/index.tcl:350 - #, tcl-format - msgid "Adding %s" - msgstr "Lägger till %s" ++#: lib/tools_dlg.tcl:341 ++msgid "OK" ++msgstr "OK" + - #: lib/index.tcl:380 ++#: lib/tools.tcl:76 +#, tcl-format - msgid "Stage %d untracked files?" - msgstr "Köa %d ospÃ¥rade filer?" ++msgid "Running %s requires a selected file." ++msgstr "För att starta %s mÃ¥ste du välja en fil." + - #: lib/index.tcl:428 ++#: lib/tools.tcl:92 +#, tcl-format - msgid "Revert changes in file %s?" - msgstr "Återställ ändringarna i filen %s?" ++msgid "Are you sure you want to run %1$s on file \"%2$s\"?" ++msgstr "Är du säker pÃ¥ att du vill starta %1$s med filen ”%2$s”?" + - #: lib/index.tcl:430 ++#: lib/tools.tcl:96 +#, tcl-format - msgid "Revert changes in these %i files?" - msgstr "Återställ ändringarna i dessa %i filer?" - - #: lib/index.tcl:438 - msgid "Any unstaged changes will be permanently lost by the revert." - msgstr "" - "Alla oköade ändringar kommer permanent gÃ¥ förlorade vid Ã¥terställningen." - - #: lib/index.tcl:441 - msgid "Do Nothing" - msgstr "Gör ingenting" - - #: lib/index.tcl:459 - msgid "Reverting selected files" - msgstr "Återställer valda filer" ++msgid "Are you sure you want to run %s?" ++msgstr "Är du säker pÃ¥ att du vill starta %s?" + - #: lib/index.tcl:463 ++#: lib/tools.tcl:118 +#, tcl-format - msgid "Reverting %s" - msgstr "Återställer %s" - - #: lib/encoding.tcl:443 - msgid "Default" - msgstr "Standard" ++msgid "Tool: %s" ++msgstr "Verktyg: %s" + - #: lib/encoding.tcl:448 ++#: lib/tools.tcl:119 +#, tcl-format - msgid "System (%s)" - msgstr "Systemets (%s)" - - #: lib/encoding.tcl:459 lib/encoding.tcl:465 - msgid "Other" - msgstr "Annan" ++msgid "Running: %s" ++msgstr "Exekverar: %s" + - #: lib/date.tcl:25 ++#: lib/tools.tcl:158 +#, tcl-format - msgid "Invalid date from Git: %s" - msgstr "Ogiltigt datum frÃ¥n Git: %s" - - #: lib/database.tcl:42 - msgid "Number of loose objects" - msgstr "Antal lösa objekt" ++msgid "Tool completed successfully: %s" ++msgstr "Verktyget avslutades framgÃ¥ngsrikt: %s" + - #: lib/database.tcl:43 - msgid "Disk space used by loose objects" - msgstr "Diskutrymme använt av lösa objekt" ++#: lib/tools.tcl:160 ++#, tcl-format ++msgid "Tool failed: %s" ++msgstr "Verktyget misslyckades: %s" + - #: lib/database.tcl:44 - msgid "Number of packed objects" - msgstr "Antal packade objekt" ++#: lib/transport.tcl:7 ++#, tcl-format ++msgid "Fetching new changes from %s" ++msgstr "Hämtar nya ändringar frÃ¥n %s" + - #: lib/database.tcl:45 - msgid "Number of packs" - msgstr "Antal paket" ++#: lib/transport.tcl:18 ++#, tcl-format ++msgid "remote prune %s" ++msgstr "fjärrborttagning %s" + - #: lib/database.tcl:46 - msgid "Disk space used by packed objects" - msgstr "Diskutrymme använt av packade objekt" ++#: lib/transport.tcl:19 ++#, tcl-format ++msgid "Pruning tracking branches deleted from %s" ++msgstr "Tar bort spÃ¥rande grenar som tagits bort frÃ¥n %s" + - #: lib/database.tcl:47 - msgid "Packed objects waiting for pruning" - msgstr "Packade objekt som väntar pÃ¥ städning" ++#: lib/transport.tcl:25 ++msgid "fetch all remotes" ++msgstr "hämta alla fjärrarkiv" + - #: lib/database.tcl:48 - msgid "Garbage files" - msgstr "Skräpfiler" ++#: lib/transport.tcl:26 ++msgid "Fetching new changes from all remotes" ++msgstr "Hämtar nya ändringar frÃ¥n alla fjärrarkiv" + - #: lib/database.tcl:72 - msgid "Compressing the object database" - msgstr "Komprimerar objektdatabasen" ++#: lib/transport.tcl:40 ++msgid "remote prune all remotes" ++msgstr "rensa alla fjärrarkiv" + - #: lib/database.tcl:83 - msgid "Verifying the object database with fsck-objects" - msgstr "Verifierar objektdatabasen med fsck-objects" ++#: lib/transport.tcl:41 ++msgid "Pruning tracking branches deleted from all remotes" ++msgstr "Rensar spÃ¥rande grenar som tagits bort, frÃ¥n alla fjärrarkiv" + - #: lib/database.tcl:107 ++#: lib/transport.tcl:55 +#, tcl-format - msgid "" - "This repository currently has approximately %i loose objects.\n" - "\n" - "To maintain optimal performance it is strongly recommended that you compress " - "the database.\n" - "\n" - "Compress the database now?" - msgstr "" - "Arkivet har för närvarande omkring %i lösa objekt.\n" - "\n" - "För att bibehÃ¥lla optimal prestanda rekommenderas det Ã¥ det bestämdaste att " - "du komprimerar databasen.\n" - "\n" - "Komprimera databasen nu?" - - #: lib/error.tcl:20 lib/error.tcl:116 - msgid "error" - msgstr "fel" - - #: lib/error.tcl:36 - msgid "warning" - msgstr "varning" - - #: lib/error.tcl:96 - msgid "You must correct the above errors before committing." - msgstr "Du mÃ¥ste rätta till felen ovan innan du checkar in." ++msgid "Pushing changes to %s" ++msgstr "Sänder ändringar till %s" + - #~ msgid "Displaying only %s of %s files." - #~ msgstr "Visar endast %s av %s filer." ++#: lib/transport.tcl:93 ++#, tcl-format ++msgid "Mirroring to %s" ++msgstr "Speglar till %s" + - #~ msgid "Case-Sensitive" - #~ msgstr "Skilj pÃ¥ VERSALER/gemener" ++#: lib/transport.tcl:111 ++#, tcl-format ++msgid "Pushing %s %s to %s" ++msgstr "Sänder %s %s till %s" + - #~ msgid "Cannot use funny .git directory:" - #~ msgstr "Kan inte använda underlig .git-katalog:" ++#: lib/transport.tcl:132 ++msgid "Push Branches" ++msgstr "Sänd grenar" + - #~ msgid "Preferences..." - #~ msgstr "Inställningar..." ++#: lib/transport.tcl:147 ++msgid "Source Branches" ++msgstr "Källgrenar" + - #~ msgid "Always (Do not perform merge test.)" - #~ msgstr "Alltid (utför inte sammanslagningstest)." ++#: lib/transport.tcl:162 ++msgid "Destination Repository" ++msgstr "Destinationsarkiv" + - #~ msgid "URL:" - #~ msgstr "Webbadress:" ++#: lib/transport.tcl:205 ++msgid "Transfer Options" ++msgstr "Överföringsalternativ" + - #~ msgid "Delete Remote Branch" - #~ msgstr "Ta bort fjärrgren" ++#: lib/transport.tcl:207 ++msgid "Force overwrite existing branch (may discard changes)" ++msgstr "Tvinga överskrivning av befintlig gren (kan kasta bort ändringar)" + - #~ msgid "" - #~ "Unable to start gitk:\n" - #~ "\n" - #~ "%s does not exist" - #~ msgstr "" - #~ "Kan inte starta gitk:\n" - #~ "\n" - #~ "%s finns inte" ++#: lib/transport.tcl:211 ++msgid "Use thin pack (for slow network connections)" ++msgstr "Använd tunt paket (för lÃ¥ngsamma nätverksanslutningar)" + - #~ msgid "Apple" - #~ msgstr "Äpple" ++#: lib/transport.tcl:215 ++msgid "Include tags" ++msgstr "Ta med taggar" + - #~ msgid "Not connected to aspell" - #~ msgstr "Inte ansluten till aspell" ++#: lib/transport.tcl:229 ++#, tcl-format ++msgid "%s (%s): Push" ++msgstr "%s (%s): Sänd"