Updated

Tortoise_fr.po

@@ -36,7 +36,7 @@
 # Lübbe Onken <l.onken@rac.de>, 2011
 # Lübbe Onken <luebbe.opensource@gmail.com>, 2011
 # Lucas Mascaro <mascaro.lucas@yahoo.fr>, 2015
-# Mathieu Lavigne <bludwarf@gmail.com>, 2017
+# Mathieu Lavigne <bludwarf@gmail.com>, 2017-2018
 # Mickael Patron <mickael_patron@hotmail.com>, 2012
 # bauland <nicolas.bauland@laposte.net>, 2014-2016
 # peter griffin <softy@yopmail.com>, 2013
@@ -59,8 +59,8 @@ msgstr ""
 "Project-Id-Version: TortoiseGit\n"
 "Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n"
 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
-"PO-Revision-Date: 2018-01-27 14:43+0000\n"
-"Last-Translator: Raphaël MICHEL <raphael.michel@tymsoft.fr>\n"
+"PO-Revision-Date: 2018-02-07 13:48+0000\n"
+"Last-Translator: Mathieu Lavigne <bludwarf@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/lznuaa/tortoisegit/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -219,7 +219,7 @@ msgstr "%1!s!\nTaille %2!s!"
 msgid ""
 "%1: %2\n"
 "Continue running script?"
-msgstr "%1: %2\nContinuer l'exécution du script?"
+msgstr "%1: %2\nContinuer l'exécution du script ?"
 #. Resource IDs: (AFX_IDP_FAILED_INVALID_PATH)
 #, c-format
@@ -341,7 +341,7 @@ msgstr "%s\nN'a pas pu être patché correctement."
 msgid ""
 "%s\n"
 "Do you want to remove it anyway?"
-msgstr "%s\nVoulez-vous le supprimer quand même?"
+msgstr "%s\nVoulez-vous le supprimer quand même ?"
 #. Resource IDs: (IDS_ERR_FILE_NOTAFILE)
 #, c-format
@@ -349,7 +349,7 @@ msgid ""
 "%s\n"
 "is a directory, not a file!\n"
 "TortoiseGitMerge can't diff directories."
-msgstr "%s\nest un répertoire, pas un fichier!\nTortoiseGitMerge ne peut pas comparer les répertoires."
+msgstr "%s\nest un répertoire, pas un fichier !\nTortoiseGitMerge ne peut pas comparer les répertoires."
 #. Resource IDs: (Dialog IDD_RENAME: Control id 1483)
 msgid "&..."
@@ -441,7 +441,7 @@ msgstr "&Annoter les révisions"
 #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 65535)
 msgid "&Border:"
-msgstr "$Bordur:"
+msgstr "$Bordure :"
 #. Resource IDs: (Dialog IDD_EXPORT: Control id 1512, Dialog IDD_GITSWITCH:
 #. Control id 1512, Dialog IDD_MERGE: Control id 1512, Dialog
@@ -1607,7 +1607,7 @@ msgstr "Interrompre la fusion en cours."
 #. Resource IDs: (cmdAbout_LabelTitle_RESID)
 msgid "Abou&t TortoiseGitMerge"
-msgstr ""
+msgstr "À propos de &TortoiseGitMerge"
 #. Resource IDs: (Dialog IDD_ABOUT: Control id 129)
 msgid "About TortoiseGit"
@@ -3046,7 +3046,7 @@ msgstr "Type de configuration:"
 #. Resource IDs: (cmdRegexFilterConfig2_LabelTitle_RESID)
 msgid "Configure Filter Regex"
-msgstr ""
+msgstr "Configurer l'expression régulière du filtre"
 #. Resource IDs: (IDS_CONFIGUREREGEXES, ID_REGEXFILTER - Menu)
 msgid "Configure Filter Regexes"
@@ -3242,7 +3242,7 @@ msgid ""
 "Could not find \"msysgit\" or \"windows\" in versionstring of git.exe.\n"
 "If you are using git of the cygwin or msys2 environment you need to enable special hacks.\n"
 "For more information see the help file for the keyword \"cygwin git\" or \"msys2 git\"."
-msgstr ""
+msgstr "\"msysgit\" ou \"windows\" introuvable dans le versionstring de git.exe. Si vous utilisez git dans un environnement cygwin ou msys2 il est nécessaire d'activer des contournement spéciaux.\nPour plus d'informations veuillez rechercher \"cygwin git\" ou \"msys2 git\" dans l'aide."
 #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT)
 #, c-format
@@ -3336,7 +3336,7 @@ msgid ""
 "Could not start git.exe. A dynamic library (dll) is missing.\n"
 "You might need to specify an extra PATH.\n"
 "Check help file for \"Extra PATH\"."
-msgstr ""
+msgstr "Démarrage impossible de git.exe. Il manque une librairie dynamique (dll). Vous devez peut-être ajouter des entrées à votre PATH. Consultez l'aide pour plus de détails."
 #. Resource IDs: (AFX_IDP_FAILED_TO_START_PRINT)
 msgid "Could not start print job."
@@ -3501,7 +3501,7 @@ msgstr "Branche courante :"
 msgid ""
 "Current HEAD is detached, you are working on (no branch).\n"
 "Do you want to create a branch now?"
-msgstr ""
+msgstr "HEAD actuelle détachée, vous travaillez sur (aucune branche).\nVoulez-vous créer une branche maintenant ?"
 #. Resource IDs: (IDS_REBASE_UPTODATE_FMT)
 #, c-format
@@ -3515,7 +3515,7 @@ msgstr "La branche courante %s est à jour\n\nSi vous voulez forcer le rebase, m
 msgid ""
 "Current branch is up to date or newer than the fetched branch. Open rebase "
 "anyway?"
-msgstr ""
+msgstr "La branche actuelle est à jour ou en avance par rapport à la distante. Souhaitez-vous quand même ouvrir le rebase ?"
 #. Resource IDs: (Dialog IDD_CHECKFORUPDATES: Control id 1113)
 msgid "Current version is:"
@@ -3849,7 +3849,7 @@ msgstr "Comparer avec le parent %d"
 #. Resource IDs: (IDS_TAGCOMPARE_DIFFER)
 msgid "Differ"
-msgstr ""
+msgstr "Diffèrent"
 #. Resource IDs: (Dialog IDD_DIFFFILES: Control id 1302)
 msgid "Difference between"
@@ -3882,7 +3882,7 @@ msgstr "Désactiver le son"
 #. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1536)
 msgid "Disable status cache for elevated processes"
-msgstr ""
+msgstr "Désactiver le cache du statut pour les processus exécutés en mode administrateur"
 #. Resource IDs: (IDS_SETTINGS_RECURSIVE_TT)
 msgid ""
@@ -4004,11 +4004,11 @@ msgstr "Voulez-vous vraiment déplacer ce fichier ou ce répertoire?"
 msgid ""
 "Do you really want to permanently delete the %d selected refs? It can NOT be"
 " recovered!"
-msgstr ""
+msgstr "Souhaitez-vous réellement supprimer les %d références sélectionnées ? Elle ne pourront PAS être récupérées !"
 #. Resource IDs: (IDS_PROC_PUSH_ALLBRANCHES)
 msgid "Do you really want to push all local branches?"
-msgstr ""
+msgstr "Souhaitez-vous réellement pousser toutes les branches locales ?"
 #. Resource IDs: (IDS_WARN_DELETE_ONE_FROM_INDEX)
 #, c-format
@@ -4163,7 +4163,7 @@ msgstr "Lecteurs A: et B:"
 #. Resource IDs: (IDS_DROPONESTASH)
 msgid "Drop &one stash"
-msgstr ""
+msgstr "Supprimer un élément remisé"
 #. Resource IDs: (Dialog IDD_CLEAN: Control id 1731)
 msgid "Dry run"
@@ -4180,7 +4180,7 @@ msgstr "Groupe factice pour locat TabCtr"
 #. Resource IDs: (cmdEditEnabled_Keytip_RESID, cmdTabEdit_Keytip_RESID)
 msgid "E"
-msgstr ""
+msgstr "E"
 #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_EDIT)
 msgid "E&dit unselected"
@@ -5290,7 +5290,7 @@ msgstr "Git a reporté une erreur lors de la création d'un dépôt!\n"
 msgid ""
 "Git requires that you set up a user name and email address. Both are used as"
 " meta data for your commits (not for authentication)."
-msgstr ""
+msgstr "Git nécessite que vous configuriez un nom et un courriel. Ils sont tous les deux utilisés pour stocker les métadonnées de vos commits (pas pour l'authentification)."
 #. Resource IDs: (32787)
 msgid "Git revision list contains the complete file history"
@@ -5483,7 +5483,7 @@ msgstr "Conseil"
 msgid ""
 "Hint: Recently used commit messages are available using the context menu of "
 "the text field."
-msgstr ""
+msgstr "Conseil : Les messages des commits récents sont disponibles en faisant un clic droit dans la zone de texte."
 #. Resource IDs: (Dialog IDD_SETTINGSHOOKS: Control id 103)
 msgid "Hook Scripts"
@@ -5507,7 +5507,7 @@ msgstr "Type de hook :"
 #. Resource IDs: (Dialog IDD_FIRSTSTARTWIZARD_GIT: Control id 1841)
 msgid "I don't use Git for Windows and need special workarounds"
-msgstr ""
+msgstr "Je n'utilise pas \"Git for Windows\" et j'ai besoin de contournements spéciaux."
 #. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 65535)
 msgid "I&nclude paths:"
@@ -5830,7 +5830,7 @@ msgstr "Si sélectionné, alors les fichiers non versionnés marqueront le statu
 #. Resource IDs: (IDS_SETTINGS_GITCONFIG_INHERIT_TT)
 msgid ""
 "If this is enabled, no value is stored or overwritten at this config level."
-msgstr ""
+msgstr "Si activé, aucune valeur n'est stockée ou écrasée à ce niveau de configuration."
 #. Resource IDs: (Dialog IDD_CREATEREPO: Control id 1654)
 msgid ""
@@ -6095,7 +6095,7 @@ msgid ""
 "Do you want to ignore this warning and keep these lines or abort committing in order to edit the commit message?\n"
 "\n"
 "You can automatically remove these lines by enabling \"Strip lines starting with \"#\" in commit messages\" in TortoiseGit settings."
-msgstr ""
+msgstr "On dirait que votre message de commit contient un conseil sur des conflits (une ligne avec \"# Conflicts:\"). Ce conseil est automatiquement ajouté par Git lorsqu'on utilise la ligne de commande mais il est inutile de le conserver.\n\nSouhaitez-vous ignorer cet avertissement et conserver ces lignes ou plutôt annuler pour modifier le message ?\n\nVous pouvez automatiquement retirer ces lignes en activant \"Supprimer les lignes commençant par \"#\" dans le message de commit\" dans les paramètres de TortoiseGit."
 #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1074)
 msgid "J&ump to first conflict when loading"
@@ -6414,7 +6414,7 @@ msgstr "Login :"
 #. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1550)
 msgid "M&erge: Resets the index and try to reconstruct the pre-merge state"
-msgstr ""
+msgstr "M&erge : Réinitialise l'index et tente de reconstruire l'état avant merge"
 #. Resource IDs: (IDS_SMTP_MAPI)
 msgid "MAPI"
@@ -6848,14 +6848,14 @@ msgstr "Aucun fichier n'a été modifié ou ajoutés depuis\nla dernière livrai
 #. Resource IDs: (33002)
 msgid "No filter"
-msgstr ""
+msgstr "Aucun filtre"
 #. Resource IDs: (IDS_PROC_NOMSYSGIT)
 msgid ""
 "No git.exe found.\n"
 "\n"
 "TortoiseGit requires a git.exe for its operations (e.g., such as provided by the Git for Windows package)."
-msgstr ""
+msgstr "git.exe introuvable.\n\nTortoiseGit en a besoin pour fonctionner (ex. : \"Git for Windows\" contient cet exécutable)."
 #. Resource IDs: (IDS_REVGRAPH_ERR_NOGRAPH)
 msgid "No graph available"
@@ -7164,7 +7164,7 @@ msgstr "Fichiers fusionnés seulement"
 #. Resource IDs: (Dialog IDD_SETTINGSTBLAME: Control id 1677,
 #. ID_VIEW_ONLYCONSIDERFIRSTPARENTS - Menu)
 msgid "Only consider first parents on blame"
-msgstr ""
+msgstr "Tenir compte uniquement des premiers parents pour le blame"
 #. Resource IDs: (IDS_TAGCOMPARE_ONLYLOCAL)
 msgid "Only local"
@@ -7268,7 +7268,7 @@ msgstr "Nom d'origine"
 #. Resource IDs: (IDS_VIEW_SHOWROTHERLABELS)
 msgid "Other refs"
-msgstr ""
+msgstr "Autres références"
 #. Resource IDs: (IDS_STATGRAPH_OTHERGROUP)
 msgid "Others"
@@ -7519,7 +7519,7 @@ msgstr "Veuillez entrer un script hook à exécuter."
 msgid ""
 "Please enter a path where to apply the hook script to. Use \"*\" for all "
 "paths."
-msgstr ""
+msgstr "Veuillez entrer un chemin où appliquer le script hook. Utilisez \"*\" pour tous les chemins."
 #. Resource IDs: (IDS_FIRSTSTART_HINT3)
 msgid ""
@@ -9591,7 +9591,7 @@ msgstr "Stratégie"
 #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1406)
 msgid "Strip lines starting with \"#\" in commit message"
-msgstr "Séparer les lignes commençant par \"#\" dans le commentaire"
+msgstr "Supprimer les lignes commençant par \"#\" dans le message de commit"
 #. Resource IDs: (IDS_LOG_FILTER_SUBJECT, IDS_SUBJECT)
 msgid "Subject"

Tortoise_it.po

@@ -29,7 +29,7 @@ msgstr ""
 "Project-Id-Version: TortoiseGit\n"
 "Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n"
 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
-"PO-Revision-Date: 2018-02-07 10:47+0000\n"
+"PO-Revision-Date: 2018-02-07 11:33+0000\n"
 "Last-Translator: Giulio Franco <blunotte.gf@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/lznuaa/tortoisegit/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -1964,7 +1964,7 @@ msgstr "Alla revisione: %d"
 #. Resource IDs: (IDS_PROC_BROWSEREFS_RENAMEONLYBRANCHES)
 msgid "At the moment, you can only rename branches."
-msgstr ""
+msgstr "Al momento, solo i branch possono essere rinominati."
 #. Resource IDs: (AFX_IDS_NOT_SUPPORTED_EXCEPTION)
 msgid "Attempted an unsupported operation."
@@ -1987,7 +1987,7 @@ msgstr "Si è tentato di scrivere sul file %1 in lettura."
 #. Resource IDs: (Dialog IDD_CLEAN: Control id 65535)
 msgid "Attention: This command affects the whole working tree!"
-msgstr ""
+msgstr "Attenzione: questo comando interessa l'intero albero di lavoro!"
 #. Resource IDs: (Dialog IDD_PROMPT: Control id 131, Dialog IDD_SIMPLEPROMPT:
 #. Control id 160)
@@ -2008,15 +2008,15 @@ msgstr "Autore"
 #. Resource IDs: (IDS_PROC_LOG_AUTHOREMAIL)
 msgid "Author Email"
-msgstr ""
+msgstr "Email dell'autore"
 #. Resource IDs: (IDS_LOG_POPUP_CLIPBOARD_AUTHORSEMAIL)
 msgid "Author email addresses"
-msgstr ""
+msgstr "Indirizzi email dell'autore"
 #. Resource IDs: (IDS_LOG_POPUP_CLIPBOARD_AUTHORSNAME)
 msgid "Author names"
-msgstr ""
+msgstr "Nomi dell'autore"
 #. Resource IDs: (Dialog IDD_ABOUT: Control id 65535)
 msgid "Author:\t\t\t\tStefan Kueng"
@@ -2028,7 +2028,7 @@ msgstr "Autori"
 #. Resource IDs: (IDS_LOG_POPUP_CLIPBOARD_AUTHORSFULL)
 msgid "Authors (full)"
-msgstr ""
+msgstr "Autori (completo)"
 #. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1265)
 msgid "Authors case sensitive"
@@ -2056,7 +2056,7 @@ msgstr "Chiudi automaticamente in assenza di errori"
 #. Resource IDs: (IDS_PROGRS_CLOSE_NOPTIONS)
 msgid "Auto-close if no further options are available"
-msgstr ""
+msgstr "Chiudi automaticamente in assenza di altre opzioni"
 #. Resource IDs: (IDS_PROGRS_CLOSE_NOMERGES)
 msgid "Auto-close if no merges, adds or deletes"
@@ -2070,11 +2070,11 @@ msgstr "L'autocompletamento suggerisce parole (di solito classi o nomi di membri
 #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505)
 msgid "AutoLoad Putty &Key"
-msgstr ""
+msgstr "Carica automaticamente la c&hiave Putty"
 #. Resource IDs: (Dialog IDD_SYNC: Control id 1619)
 msgid "Autoload Putty &Key"
-msgstr ""
+msgstr "Carica automaticamente la c&hiave Putty"
 #. Resource IDs: (IDS_COLOURPICKER_DEFAULTTEXT)
 msgid "Automatic"
@@ -2117,7 +2117,7 @@ msgstr ""
 #. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1522)
 msgid "Base On"
-msgstr ""
+msgstr "Basato su"
 #. Resource IDs: (Dialog IDD_OPENDLG: Control id 65535)
 msgid "Base file:"
@@ -2125,7 +2125,7 @@ msgstr "File di base:"
 #. Resource IDs: (Dialog IDD_ABOUT: Control id 1005)
 msgid "Based on TortoiseIDiff of TortoiseSVN"
-msgstr ""
+msgstr "Basato su TortoiseIDiff di TortoiseSVN"
 #. Resource IDs: (IDS_PROPERTIES_BASICINFO)
 msgid "Basic Info"
@@ -2173,7 +2173,7 @@ msgstr "Biasima"
 #. Resource IDs: (IDS_BLAMEERROR)
 msgid "Blame error"
-msgstr ""
+msgstr "Errore nel biasimo"
 #. Resource IDs: (IDS_BLAME_POPUP_BLAME, IDS_LOG_POPUP_BLAMEPREVIOUS)
 msgid "Blame previous revision"
@@ -2229,7 +2229,7 @@ msgstr "Ramo"
 msgid ""
 "Branch %s behind %s\n"
 "%s will fastforward to %s"
-msgstr ""
+msgstr "Il branch %s è precedente a %s\n%s sarà avanzato a %s in fast-forward"
 #. Resource IDs: (IDS_PROC_BRANCH_FF)
 msgid "Branch (FF)"
@@ -2245,11 +2245,11 @@ msgstr ""
 #. Resource IDs: (IDS_B_T_INVALID)
 msgid "Branch/Tag name is invalid."
-msgstr ""
+msgstr "Nome non valido per il branch/tag"
 #. Resource IDs: (IDS_B_T_NOTEMPTY)
 msgid "Branch/Tag name must not be empty or is invalid."
-msgstr ""
+msgstr "Il nome del branch/tag non deve essere vuoto, altrimenti non è valido."
 #. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1518)
 msgid "Branch:"
@@ -2352,7 +2352,7 @@ msgstr "Calcola"
 #. Resource IDs: (IDS_ERR_GITCALLFAILED)
 #, c-format
 msgid "Calling git.exe failed (exit code: %d). Please check the git.exe path."
-msgstr ""
+msgstr "La chiamata a git.exe è fallita (codice di errore: %d). Controlla che il percorso di git.exe sia corretto."
 #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 1127)
 msgid "Can double-click in log list to compare with previous revision"
@@ -2456,7 +2456,7 @@ msgstr ""
 #. Resource IDs: (IDS_CANNOTBLAMENOGIT)
 #, c-format
 msgid "Cannot show blame. \"%s\" is not under version control by git."
-msgstr ""
+msgstr "Impossibile biasimare. \"%s\" non è sotto il controllo di versione di git."
 #. Resource IDs: (IDS_ERR_DIFF_NEWLINES)
 msgid "Cannot show diff because of inconsistent newlines in the file."
@@ -2480,11 +2480,11 @@ msgstr "Centro Europeo"
 #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535)
 msgid "Certificate verification failed!"
-msgstr ""
+msgstr "Verifica del certificato fallita!"
 #. Resource IDs: (Dialog IDD_CHECKFORUPDATES: Control id 1697)
 msgid "Change log"
-msgstr ""
+msgstr "Log delle modifiche"
 #. Resource IDs: (57606)
 msgid ""
@@ -2517,7 +2517,7 @@ msgstr "File modificati"
 #. Resource IDs: (IDS_FILEDIFF_CHANGEDLISTINTROROOT)
 #, c-format
 msgid "Changed files between %s and %s"
-msgstr ""
+msgstr "File modificati tra %s e %s"
 #. Resource IDs: (IDS_FILEDIFF_CHANGEDLISTINTRO)
 #, c-format
@@ -2871,11 +2871,11 @@ msgstr ""
 #. Resource IDs: (IDS_LOG_COMMIT_DATE)
 msgid "Commit Date"
-msgstr ""
+msgstr "Data del commit"
 #. Resource IDs: (IDS_LOG_COMMIT_EMAIL)
 msgid "Commit Email"
-msgstr ""
+msgstr "Email del commit"
 #. Resource IDs: (IDS_COMMIT_FINISH)
 msgid "Commit Finish"
@@ -2883,19 +2883,19 @@ msgstr ""
 #. Resource IDs: (IDS_PROPERTIES_WND)
 msgid "Commit Info"
-msgstr ""
+msgstr "Info sul commit"
 #. Resource IDs: (IDS_PROC_COMMITMESSAGE)
 msgid "Commit Message"
-msgstr ""
+msgstr "Messaggio del commit"
 #. Resource IDs: (IDS_LOG_COMMIT_NAME)
 msgid "Commit Name"
-msgstr ""
+msgstr "Nome del commit"
 #. Resource IDs: (Dialog IDD_LOGORDERING: Control id 1750)
 msgid "Commit Ordering:"
-msgstr ""
+msgstr "Ordine dei commit:"
 #. Resource IDs: (IDS_PROC_COMMIT_SUPERPROJECT)
 msgid "Commit super project"
@@ -2932,7 +2932,7 @@ msgstr "Invia i cambiamenti al repository"
 #. Resource IDs: (IDS_PROC_LOG_COMMITTEREMAIL)
 msgid "Committer Email"
-msgstr ""
+msgstr "Email del committente"
 #. Resource IDs: (IDS_COMMITDLG_UNVERSIONEDFOLDERWARNING)
 msgid ""
@@ -2944,7 +2944,7 @@ msgstr "l'invio di una cartella senza versione non aggiungerà ricorsivamente i
 #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535)
 msgid "Common Name:"
-msgstr ""
+msgstr "Nome comune:"
 #. Resource IDs: (IDS_REVGRAPH_POPUP_COMPAREHEADS,
 #. ID_VIEW_COMPAREHEADREVISIONS - Menu)

Tortoise_ru.po

@@ -8,9 +8,9 @@
 # Alexander Shchekaturov <shcham@gmail.com>, 2013-2016
 # Andrei Stepanov, 2014-2017
 # Arioch <the_Arioch@nm.ru>, 2012-2013
-# Arkady “KindDragon” Shapkin <arkadiy_s@inbox.ru>, 2011
-# Arkady “KindDragon” Shapkin <arkadiy_s@inbox.ru>, 2011
-# Arkady “KindDragon” Shapkin <arkadiy_s@inbox.ru>, 2011
+# Arkady Shapkin <arkadiy_s@inbox.ru>, 2011
+# Arkady Shapkin <arkadiy_s@inbox.ru>, 2011
+# Arkady Shapkin <arkadiy_s@inbox.ru>, 2011
 # KOLANICH, 2013-2015
 # _deniska <denis_levin@mail.ru>, 2011
 # Dimitriy Ryazantcev <DJm00n@mail.ru>, 2015-2016
@@ -22,7 +22,7 @@
 # KorneySan <korneysan@tut.by>, 2017
 # Lübbe Onken <l.onken@rac.de>, 2011
 # Alexander Shchekaturov <shcham@gmail.com>, 2013
-# Stanislav Kroter <krotersv@gmail.com>, 2016-2017
+# Stanislav Kroter <krotersv@gmail.com>, 2016-2018
 # Sven Strickroth <sstrickroth@googlemail.com>, 2012-2013
 # Дмитрий Сытьков <sytkov@gmail.com>, 2011
 # Arioch <the_Arioch@nm.ru>, 2013
@@ -36,8 +36,8 @@ msgstr ""
 "Project-Id-Version: TortoiseGit\n"
 "Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n"
 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
-"PO-Revision-Date: 2018-01-21 21:11+0000\n"
-"Last-Translator: Sven Strickroth <sstrickroth@googlemail.com>\n"
+"PO-Revision-Date: 2018-02-07 15:49+0000\n"
+"Last-Translator: Stanislav Kroter <krotersv@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/lznuaa/tortoisegit/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -667,7 +667,7 @@ msgstr "&Файл"
 #. Resource IDs: (ID_VIEW_FILTER - Menu)
 msgid "&Filter"
-msgstr ""
+msgstr "&Фильтр"
 #. Resource IDs: (Dialog IDD_FIND: Control id 1)
 msgid "&Find"
@@ -720,7 +720,7 @@ msgstr "&Сгенерировать пару ключей PuTTY"
 #. Resource IDs: (65535 - PopupMenu)
 msgid "&Git"
-msgstr ""
+msgstr "&Git"
 #. Resource IDs: (Dialog IDD_SVNDCOMMITTYPE: Control id 2153)
 msgid "&Git Style Commit (--rmdir)"
@@ -764,7 +764,7 @@ msgstr "&Скрыть"
 #. Resource IDs: (cmdShowFileList_LabelTitle_RESID)
 msgid "&Hide/Show the patch file list"
-msgstr ""
+msgstr "&Скрыть/Показать список файлов заплатки"
 #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 1170)
 msgid "&Icon Set:"
@@ -1584,7 +1584,7 @@ msgstr "Прерывает процесс слияния."
 #. Resource IDs: (cmdAbout_LabelTitle_RESID)
 msgid "Abou&t TortoiseGitMerge"
-msgstr ""
+msgstr "&О TortoiseGitMerge"
 #. Resource IDs: (Dialog IDD_ABOUT: Control id 129)
 msgid "About TortoiseGit"
@@ -2324,7 +2324,7 @@ msgstr "По умолчанию Git не сохраняет и не кеширу
 #. Resource IDs: (cmdCopy_Keytip_RESID)
 msgid "C"
-msgstr ""
+msgstr "C"
 #. Resource IDs: (Dialog IDD_FIRSTSTARTWIZARD_GIT: Control id 1216, Dialog
 #. IDD_SETTINGSMAIN: Control id 1215, Dialog IDD_SETTINGSMAIN: Control id
@@ -3023,7 +3023,7 @@ msgstr "Тип конфигурации:"
 #. Resource IDs: (cmdRegexFilterConfig2_LabelTitle_RESID)
 msgid "Configure Filter Regex"
-msgstr ""
+msgstr "Настроить регулярное выражение фильтра"
 #. Resource IDs: (IDS_CONFIGUREREGEXES, ID_REGEXFILTER - Menu)
 msgid "Configure Filter Regexes"
@@ -3362,7 +3362,7 @@ msgstr "Создать &метку..."
 #. Resource IDs: (cmdCreateUnifiedDiff_LabelTitle_RESID)
 msgid "Create &patch file"
-msgstr ""
+msgstr "Создать файл заплатки"
 #. Resource IDs: (Dialog IDD_SVNIGNORE: Control id 1641)
 msgid "Create .gitignore file"
@@ -4157,7 +4157,7 @@ msgstr "Пустая группа для локального TabCtr"
 #. Resource IDs: (cmdEditEnabled_Keytip_RESID, cmdTabEdit_Keytip_RESID)
 msgid "E"
-msgstr ""
+msgstr "E"
 #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_EDIT)
 msgid "E&dit unselected"
@@ -4564,7 +4564,7 @@ msgstr "Внешняя программа:"
 #. Resource IDs: (cmdFind_Keytip_RESID)
 msgid "F"
-msgstr ""
+msgstr "F"
 #. Resource IDs: (IDS_MENUFETCH)
 msgid "F&etch..."
@@ -4849,7 +4849,7 @@ msgstr "Фильтр:"
 #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535)
 msgid "Filtered"
-msgstr ""
+msgstr "Отфильтрованное"
 #. Resource IDs: (Dialog IDD_FIND: Control id 139, Dialog IDD_FIND: Control id
 #. 20100, ID_EDIT_FIND - Menu, cmdFind_LabelTitle_RESID)
@@ -4918,11 +4918,11 @@ msgstr "Первый неудачный:"
 #. Resource IDs: (ID_VIEW_ZOOMALL - Menu)
 msgid "Fit graph"
-msgstr ""
+msgstr "Подогнать по графу"
 #. Resource IDs: (ID_VIEW_ZOOMHEIGHT - Menu)
 msgid "Fit height"
-msgstr ""
+msgstr "Подогнать по высоте"
 #. Resource IDs: (ID_VIEW_FITIMAGEHEIGHTS - Menu)
 msgid "Fit image &heights\tH"
@@ -4934,7 +4934,7 @@ msgstr "Подогнать &ширину изображений\tW"
 #. Resource IDs: (ID_VIEW_ZOOMWIDTH - Menu)
 msgid "Fit width"
-msgstr ""
+msgstr "Подогнать по ширине"
 #. Resource IDs: (Dialog IDD_SETTINGSTBLAME: Control id 1675)
 msgid "Follow renames"
@@ -5086,7 +5086,7 @@ msgstr "Остальные опции диалога фиксации перен
 #. Resource IDs: (cmdGotoLine_Keytip_RESID)
 msgid "G"
-msgstr ""
+msgstr "G"
 #. Resource IDs: (IDS_VIEW_SHOWGRAVATAR)
 msgid "G&ravatar"
@@ -6072,7 +6072,7 @@ msgid ""
 "Do you want to ignore this warning and keep these lines or abort committing in order to edit the commit message?\n"
 "\n"
 "You can automatically remove these lines by enabling \"Strip lines starting with \"#\" in commit messages\" in TortoiseGit settings."
-msgstr ""
+msgstr "Похоже, что есть конфликт подсказки (строка вроде \"# Conflicts:\") в вашем сообщении фиксации. Эта подсказка автоматически добавляется системой Git для cli-пользователей и нет нужды сохранять его.\n\nВы хотите игнорировать это предупреждение и сохранить эти строки или отменить фиксацию для того, чтобы отредактировать сообщение фиксации?\n\nВы можете автоматически удалять эти строки включив в настройках TortoiseGit \"Отключать строки установкой \"#\" в начале сообщений фиксации\"."
 #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1074)
 msgid "J&ump to first conflict when loading"
@@ -6114,7 +6114,7 @@ msgstr "Корейский"
 #. Resource IDs: (cmdViewWrapLines_Keytip_RESID)
 msgid "L"
-msgstr ""
+msgstr "L"
 #. Resource IDs: (Dialog IDD_CLONE: Control id 1847)
 msgid "LFS"