Compare revisions

TortoiseGit · TortoiseGit · 083d62f5 · 083d62f5 · 083d62f5 · 083d62f5
--- a/Tortoise_bs.po
+++ b/Tortoise_bs.po
@@ -5,13 +5,14 @@
 # 
 # Translators:
 # Edin <ed@eddsn.com>, 2015
+# Elvir Brkić <elvir@outlook.com>, 2018
 msgid ""
 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"
+"PO-Revision-Date: 2018-02-07 09:48+0000\n"
-"Last-Translator: Sven Strickroth <sstrickroth@googlemail.com>\n"
+"Last-Translator: Elvir Brkić <elvir@outlook.com>\n"
 "Language-Team: Bosnian (http://www.transifex.com/lznuaa/tortoisegit/language/bs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,112 +40,112 @@ msgstr "! %d"
 #. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1262)
 msgid "# authors shown individually:"
-msgstr ""
+msgstr "# autori prikazani individualno"
 #. Resource IDs: (IDS_SVN_PROGRESS_TOTALMBTRANSFERRED)
 #, c-format
 msgid "%.2f MiB transferred"
-msgstr ""
+msgstr "%.2f MiB preneseno"
 #. Resource IDs: (AFX_IDP_ARCH_BADCLASS)
 #, c-format
 msgid "%1 contained an unexpected object."
-msgstr ""
+msgstr "%1 sadržavao neočekivan objekat."
 #. Resource IDs: (AFX_IDP_FILE_BAD_PATH)
 #, c-format
 msgid "%1 contains an incorrect path."
-msgstr ""
+msgstr "%1 sadrži nepravilnu putanju."
 #. Resource IDs: (AFX_IDP_ARCH_BADSCHEMA)
 #, c-format
 msgid "%1 contains an incorrect schema."
-msgstr ""
+msgstr "%1 sadrži nepravilnu šemu."
 #. Resource IDs: (AFX_IDP_ARCH_BADINDEX)
 #, c-format
 msgid "%1 has a bad format."
-msgstr ""
+msgstr "%1 ima pogrešan format."
 #. Resource IDs: (AFX_IDP_FILE_NOT_FOUND)
 #, c-format
 msgid "%1 was not found."
-msgstr ""
+msgstr "%1 nije pronađen."
 #. Resource IDs: (IDS_DAY_AGO)
 #, c-format
 msgid "%1!d! Day ago"
-msgstr ""
+msgstr "Prije %1!d! dan"
 #. Resource IDs: (IDS_DAYS_AGO)
 #, c-format
 msgid "%1!d! Days ago"
-msgstr ""
+msgstr "Prije %1!d! dana"
 #. Resource IDs: (IDS_HOUR_AGO)
 #, c-format
 msgid "%1!d! Hour ago"
-msgstr ""
+msgstr "Prije %1!d! sat"
 #. Resource IDs: (IDS_HOURS_AGO)
 #, c-format
 msgid "%1!d! Hours ago"
-msgstr ""
+msgstr "Prije %1!d! sati"
 #. Resource IDs: (IDS_MINUTE_AGO)
 #, c-format
 msgid "%1!d! Minute ago"
-msgstr ""
+msgstr "Prije %1!d! minutu"
 #. Resource IDs: (IDS_MONTH_AGO)
 #, c-format
 msgid "%1!d! Month ago"
-msgstr ""
+msgstr "Prije %1!d! mjesec"
 #. Resource IDs: (IDS_MONTHS_AGO)
 #, c-format
 msgid "%1!d! Months ago"
-msgstr ""
+msgstr "Prije %1!d! mjeseci"
 #. Resource IDs: (IDS_SECOND_AGO)
 #, c-format
 msgid "%1!d! Second ago"
-msgstr ""
+msgstr "Prije %1!d! sekundu"
 #. Resource IDs: (IDS_SECONDS_AGO)
 #, c-format
 msgid "%1!d! Seconds ago"
-msgstr ""
+msgstr "Prije %1!d! sekundi"
 #. Resource IDs: (IDS_WEEK_AGO)
 #, c-format
 msgid "%1!d! Week ago"
-msgstr ""
+msgstr "Prije %1!d! sedmicu"
 #. Resource IDs: (IDS_WEEKS_AGO)
 #, c-format
 msgid "%1!d! Weeks ago"
-msgstr ""
+msgstr "Prije %1!d! sedmica"
 #. Resource IDs: (IDS_YEAR_AGO)
 #, c-format
 msgid "%1!d! Year ago"
-msgstr ""
+msgstr "Prije %1!d! godinu"
 #. Resource IDs: (IDS_YEARS_AGO)
 #, c-format
 msgid "%1!d! Years ago"
-msgstr ""
+msgstr "Prije %1!d! godina"
 #. Resource IDs: (IDS_REPOBROWSE_INFOMULTI)
 #, c-format
 msgid "%1!d! items selected"
-msgstr ""
+msgstr "Odabrano %1!d! stavki"
 #. Resource IDs: (IDS_MINUTES_AGO)
 #, c-format
 msgid "%1!d! minutes ago"
-msgstr ""
+msgstr "prije %1!d! minuta"
 #. Resource IDs: (IDS_CONFLICT_INFOTEXT)
 #, c-format
@@ -156,21 +157,21 @@ msgstr "%1!s! (%2!s!)"
 msgid ""
 "%1!s!\n"
 "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total"
-msgstr ""
+msgstr "%1!s!\nPrikazano %2!d! fajlova, %3!d! podmodula i %4!d! foldera, %5!d! stavki u totalu"
 #. Resource IDs: (IDS_REPOBROWSE_INFOFILE)
 #, c-format
 msgid ""
 "%1!s!\n"
 "Size %2!s!"
-msgstr ""
+msgstr "%1!s!\nVeličina %2!s!"
 #. Resource IDs: (AFX_IDP_SCRIPT_ERROR)
 #, c-format
 msgid ""
 "%1: %2\n"
 "Continue running script?"
-msgstr ""
+msgstr "%1: %2\nNastavi izvršavanje skripte?"
 #. Resource IDs: (AFX_IDP_FAILED_INVALID_PATH)
 #, c-format
@@ -178,27 +179,27 @@ msgid ""
 "%1\n"
 "Cannot find this file.\n"
 "Verify that the correct path and file name are given."
-msgstr ""
+msgstr "%1\nNije pronađen ovaj fajl.\nProvjeri da su unešeni pravilan naziv i putanja fajla."
 #. Resource IDs: (IDS_CONFIG_GLOBAL_TT)
 #, c-format
 msgid "%HOME%/.gitconfig or %XDGHOME%/git/config"
-msgstr ""
+msgstr "%HOME%/.gitconfig or %XDGHOME%/git/config"
 #. Resource IDs: (IDS_SVN_PROGRESS_TOTALBYTESTRANSFERRED)
 #, c-format
 msgid "%I64d Bytes transferred"
-msgstr ""
+msgstr "Prenešeno %I64d bajta"
 #. Resource IDs: (IDS_SVN_PROGRESS_TOTALTRANSFERRED)
 #, c-format
 msgid "%I64d KiB transferred"
-msgstr ""
+msgstr "Prenešeno %I64d KiB"
 #. Resource IDs: (AFX_IDS_AUTOSAVE_RECOVERED)
 #, c-format
 msgid "%Ts [Recovered]"
-msgstr ""
+msgstr "%Ts [Vraćeno]"
 #. Resource IDs: (AFX_IDS_EMBED_FORMAT, AFX_IDS_LINKSOURCE_FORMAT)
 #, c-format
@@ -210,32 +211,32 @@ msgstr "%Ts\n%Ts"
 #. Resource IDs: (IDS_PROC_SYNC_COMMITSAHEAD)
 #, c-format
 msgid "%d commits ahead \"%s\""
-msgstr ""
+msgstr "%d comita ispred \"%s\""
 #. Resource IDs: (IDS_FILESCHANGES)
 #, c-format
 msgid "%d files changed"
-msgstr ""
+msgstr "%d fajlova promijenjeno"
 #. Resource IDs: (IDS_PROC_FILESREMOVED)
 #, c-format
 msgid "%d files removed."
-msgstr ""
+msgstr "%d fajlova uklonjeno."
 #. Resource IDs: (IDS_STATUSLIST_FILESREVERTED)
 #, c-format
 msgid "%d files reverted to %s."
-msgstr ""
+msgstr "%d fajlova vraćeno na %s."
 #. Resource IDs: (IDS_COMMITDLG_STATISTICSFORMAT)
 #, c-format
 msgid "%d files selected, %d files total"
-msgstr ""
+msgstr "%d fajlova odabrano, %d fajlova ukupno"
 #. Resource IDs: (IDS_STATGRAPH_AUTHORSLIDER_TT)
 #, c-format
 msgid "%d most active author(s) with at least %d commits each (%d %%)"
-msgstr ""
+msgstr "%d najaktivniji autor(i) sa najmanje %d comita svaki (%d %%)"
 #. Resource IDs: (IDS_ALPHABUTTONTT)
 #, c-format
@@ -248,37 +249,37 @@ msgstr ""
 #. Resource IDs: (IDS_PROGRS_TIME)
 #, c-format
 msgid "%ld minute(s) and %ld second(s)"
-msgstr ""
+msgstr "%ld minuta(e) i %ld sekunda(i)"
 #. Resource IDs: (IDS_DIMENSIONSANDFRAMES)
 #, c-format
 msgid "%ld of %ld"
-msgstr ""
+msgstr "%ld od %ld"
 #. Resource IDs: (IDS_PROGRS_PATHATREV)
 #, c-format
 msgid "%s - at revision: %d"
-msgstr ""
+msgstr "%s - na reviziji: %d"
 #. Resource IDs: (IDS_PROGRS_FINALINFO)
 #, c-format
 msgid "%s in %s"
-msgstr ""
+msgstr "%s u %s"
 #. Resource IDs: (IDS_GITVER_REQUIRED)
 #, c-format
 msgid "%s requires Git >= %s"
-msgstr ""
+msgstr "%s zahtjeva Git >= %s"
 #. Resource IDs: (IDS_SVN_PROGRESS_TOTALANDSPEED)
 #, c-format
 msgid "%s, at %s"
-msgstr ""
+msgstr "%s, na %s"
 #. Resource IDs: (IDS_DIFF_WCNAME)
 #, c-format
 msgid "%s: Working Tree"
-msgstr ""
+msgstr "%s: Radno stablo"
 #. Resource IDs: (IDS_PATCH_ITEMTT)
 #, c-format

--- a/Tortoise_de.po
+++ b/Tortoise_de.po
@@ -9,7 +9,7 @@
 # djungbeck, 2013
 # Lübbe  <luebbe.tortoisesvn@googlemail.com>, 2012
 # Lübbe Onken <l.onken@rac.de>, 2011-2012, 2013
-# Lübbe TortoiseSVN <luebbe.tortoisesvn@gmail.com>, 2012
+# Lübbe Onken <luebbe.opensource@gmail.com>, 2012
 # Sven Strickroth <sstrickroth@googlemail.com>, 2012-2018
 # Thilo Berger <thilob.tb34@gmail.com>, 2017
 # Torsten Widmann <goover0976@googlemail.com>, 2012
@@ -18,7 +18,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-01-21 21:11+0000\n"
+"PO-Revision-Date: 2018-02-07 09:16+0000\n"
 "Last-Translator: Sven Strickroth <sstrickroth@googlemail.com>\n"
 "Language-Team: German (http://www.transifex.com/lznuaa/tortoisegit/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -11243,7 +11243,7 @@ msgid ""
 "If you want to abort the merge, do a hard reset on HEAD or select abort merge on the context menu.\n"
 "\n"
 "See help for more information."
-msgstr ""
+msgstr "Während des Zusammenführens, d.h. dem Integrieren der Änderzungen eines (entfernten) Zweiges in Ihren lokalen Zweig, ist ein Konflikt bei mindestens einer Datei aufgetreten. Dies bedeutet, dass dieser manuell behoben werden muss (d.h. Sie müssen Ihre Änderungen in die Datei integrieren, die auch auf dem anderen Zweig modifiziert wurde).\n\nNach der Konfliktbehebung in allen Dateien müssen Sie eine Eintragung durchführen, um das Zusammenführen abzuschließen.\n\nWenn Sie das Zusammenführen abbrechen möchten, führen Sie einen harten Reset durch oder wählen Sie \"Zusammenführen abbrechen\" im Kontextmenü.\n\nBitte konsultieren Sie die Hilfe für mehr Informationen."
 #. Resource IDs: (IDS_DAEMON_SECURITY_WARN)
 msgid ""

--- a/Tortoise_fr.po
+++ b/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"
+"PO-Revision-Date: 2018-02-07 13:48+0000\n"
-"Last-Translator: Raphaël MICHEL <raphael.michel@tymsoft.fr>\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"

--- a/Tortoise_it.po
+++ b/Tortoise_it.po
@@ -10,10 +10,11 @@
 # Antonio <akirarulez@yahoo.it>, 2013
 # Cecilia Saltori <csaltori@gmail.com>, 2011
 # Emilio Bologna <>, 2012
+# Giulio Franco <blunotte.gf@gmail.com>, 2018
 # Giuseppe Bogetti <orangesocks@bgsoft.it>, 2016
 # Lübbe  <luebbe.tortoisesvn@googlemail.com>, 2012
 # Lübbe Onken <l.onken@rac.de>, 2011
-# Lübbe TortoiseSVN <luebbe.tortoisesvn@gmail.com>, 2011
+# Lübbe Onken <luebbe.opensource@gmail.com>, 2011
 # Michele Locati <mlocati@gmail.com>, 2012
 # Nathan McCoy, 2013
 # Nicolò Altamura <inactive+nicoalta01@transifex.com>, 2015
@@ -28,8 +29,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"
+"PO-Revision-Date: 2018-02-07 11:33+0000\n"
-"Last-Translator: Sven Strickroth <sstrickroth@googlemail.com>\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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -402,11 +403,11 @@ msgstr "&Biasimare"
 #. Resource IDs: (IDS_LOG_POPUP_BLAMEDIFF)
 msgid "&Blame changes"
-msgstr "&Suggerisci modifiche"
+msgstr "&Biasima le modifiche"
 #. Resource IDs: (IDS_FILEDIFF_POPBLAME, IDS_LOG_POPUP_BLAMEREVS)
 msgid "&Blame revisions"
-msgstr "&Suggerisci revisioni"
+msgstr "&Biasima le revisioni"
 #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 65535)
 msgid "&Border:"
@@ -570,7 +571,7 @@ msgstr "&Non visualizzare più questo messaggio"
 #. Resource IDs: (Dialog IDD_FIRSTSTARTWIZARD_AUTHENTICATION: Control id 1839,
 #. Dialog IDD_FIRSTSTARTWIZARD_USER: Control id 1839)
 msgid "&Don't store these settings now."
-msgstr ""
+msgstr "&Non salvare queste impostazioni."
 #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1384)
 msgid "&Down"
@@ -621,7 +622,7 @@ msgstr "&Email:"
 #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQADV: Control id 1023, Dialog
 #. IDD_SETTINGSHOOKCONFIG: Control id 1023)
 msgid "&Enable"
-msgstr ""
+msgstr "&Abilita"
 #. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 1023)
 msgid "&Enable Proxy Server"
@@ -633,7 +634,7 @@ msgstr "&Abilita modifica"
 #. Resource IDs: (ID_MENUEXIT - Menu)
 msgid "&Exit"
-msgstr ""
+msgstr "&Esci"
 #. Resource IDs: (ID_FILE_EXIT - Menu)
 msgid "&Exit\tCtrl+W"
@@ -708,11 +709,11 @@ msgstr "&Da"
 #. Resource IDs: (Dialog IDD_FIRSTSTARTWIZARD_AUTHENTICATION: Control id 1844)
 msgid "&Generate PuTTY  key pair"
-msgstr ""
+msgstr "&Genera una coppia di chiavi PuTTY"
 #. Resource IDs: (65535 - PopupMenu)
 msgid "&Git"
-msgstr ""
+msgstr "&Git"
 #. Resource IDs: (Dialog IDD_SVNDCOMMITTYPE: Control id 2153)
 msgid "&Git Style Commit (--rmdir)"
@@ -721,7 +722,7 @@ msgstr "&Commit di Stile Git (--rmdir)"
 #. Resource IDs: (Dialog IDD_FIRSTSTARTWIZARD_GIT: Control id 65535, Dialog
 #. IDD_SETTINGSMAIN: Control id 65535)
 msgid "&Git.exe Path:"
-msgstr ""
+msgstr "&Percorso di Git.exe:"
 #. Resource IDs: (ID_EDIT_GOTO - Menu)
 msgid "&Go to\tCtrl+G"
@@ -756,7 +757,7 @@ msgstr "&Nascondi"
 #. Resource IDs: (cmdShowFileList_LabelTitle_RESID)
 msgid "&Hide/Show the patch file list"
-msgstr ""
+msgstr "&Nascondi/Mostra la lista dei file di patch"
 #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 1170)
 msgid "&Icon Set:"
@@ -868,7 +869,7 @@ msgstr "&Unisci"
 #. Resource IDs: (IDS_MERGE_UNRELATED)
 msgid "&Merge unrelated history"
-msgstr ""
+msgstr "&Unisci storie indipendenti"
 #. Resource IDs: (IDS_MENUMERGE)
 msgid "&Merge..."
@@ -930,7 +931,7 @@ msgstr "&No"
 #. Resource IDs: (Dialog IDD_SUBMODULE_UPDATE: Control id 1734)
 msgid "&No fetch"
-msgstr "&No Fetch"
+msgstr "&Non recuperare"
 #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1702)
 msgid "&None"
@@ -1500,7 +1501,7 @@ msgid ""
 "A newline separated list of paths for which icon overlays are shown.\n"
 "If you add an '?' char at the end of a path, then only this path will be included.\n"
 "If you add an '*' or no char at all at the end of a path, then all files and subdirs inside that path are included too."
-msgstr ""
+msgstr "Una lista di percorsi, uno per riga, per cui vengono visualizzate le icone overlay.\nSe aggiungi il carattere '?' alla fine di un percorso, solo tale percorso sarà incluso.\nSe non lo fai, o se aggiungi il carattere '*' alla fine di un percorso, saranno inclusi anche tutti i file e le sottocartelle in quel percorso."
 #. Resource IDs: (IDS_SETTINGS_EXCLUDECONTEXTLIST_TT)
 msgid ""
@@ -1515,7 +1516,7 @@ msgid ""
 "If you add an '?' char at the end of a path, then only this path will be excluded.\n"
 "If you add an '*' or no char at all at the end of a path, then all files and subdirs inside that path are excluded too.\n"
 "An empty list will allow overlays on all paths."
-msgstr ""
+msgstr "Una lista di percorsi, uno per riga, per cui non vengono visualizzate le icone overlay.\nSe aggiungi il carattere '?' alla fine di un percorso, solo tale percorso sarà escluso.\nSe non lo fai, o se aggiungi il carattere '*' alla fine di un percorso, saranno esclusi anche tutti i file e le sottocartelle in quel percorso.\nUna lista vuota permetterà gli overlay in tutti i percorsi."
 #. Resource IDs: (AFX_IDS_RESOURCE_EXCEPTION)
 msgid "A required resource was unavailable."
@@ -1576,7 +1577,7 @@ msgstr "Interrompe un'unione in corso."
 #. Resource IDs: (cmdAbout_LabelTitle_RESID)
 msgid "Abou&t TortoiseGitMerge"
-msgstr ""
+msgstr "Info su &TortoiseGitMerge"
 #. Resource IDs: (Dialog IDD_ABOUT: Control id 129)
 msgid "About TortoiseGit"
@@ -1584,7 +1585,7 @@ msgstr "Informazioni su TortoiseGit"
 #. Resource IDs: (Dialog IDD_ABOUTBOX: Control id 100)
 msgid "About TortoiseGitBlame"
-msgstr "Info su TortoiseGitBlame"
+msgstr "Informazioni su TortoiseGitBlame"
 #. Resource IDs: (Dialog IDD_ABOUT: Control id 136)
 msgid "About TortoiseGitMerge"
@@ -1816,7 +1817,7 @@ msgid ""
 "You can specify the following parameters to the path:\n"
 "%base: the base file\n"
 "%mine: the modified file"
-msgstr ""
+msgstr "Un programma esterno, utilizzato\nper confrontare differenti revisioni dei file.\n\nPuoi specificare i seguenti parametri per il percorso:\n%base: il file di base\n%mine: il file modificato"
 #. Resource IDs: (IDS_SETTINGS_EXTMERGE_TT)
 #, c-format
@@ -1829,7 +1830,7 @@ msgid ""
 "%theirs: the file as it is in the repository\n"
 "%mine: your own file, with your changes\n"
 "%base: the original file without your changes"
-msgstr ""
+msgstr "Un programma esterno per unire file, utilizzato\nper risolvere i file in conflitto.\n\nPuoi specificare i seguenti parametri per il percorso:\n%merged: il file in conflitto, da salvare\n%theirs: il file che si trova nel repository\n%mine: il tuo file, con le tue modifiche\n%base: il file originale, senza le tue modifiche"
 #. Resource IDs: (AFX_IDP_FILE_INVALID_FILE)
 #, c-format
@@ -1864,7 +1865,7 @@ msgstr "Accoda questo blocco a sinistra"
 #. Resource IDs: (ID_FILE_APPLYPATCH - Menu)
 msgid "Apply &Patch..."
-msgstr ""
+msgstr "Applica &Patch..."
 #. Resource IDs: (IDS_MENUIMPORTPATCH)
 msgid "Apply Patch Serial..."
@@ -1880,7 +1881,7 @@ msgstr "Applica patch"
 #. Resource IDs: (IDS_MENUDESCIMPORTPATCH)
 msgid "Apply a series of patches from a mailbox"
-msgstr ""
+msgstr "Applica una serie di patch da una casella di posta"
 #. Resource IDs: (Dialog IDD_OPENDLG: Control id 1072)
 msgid "Apply unified diff"
@@ -1901,11 +1902,11 @@ msgstr ""
 #. Resource IDs: (IDS_PROC_REBASE_ABORT)
 msgid "Are you sure you want to abort the rebase process?"
-msgstr ""
+msgstr "Interrompere il processo di rebase?"
 #. Resource IDs: (IDS_REALLYCANCEL)
 msgid "Are you sure you want to cancel?"
-msgstr ""
+msgstr "Vuoi davvero annullare?"
 #. Resource IDs: (IDS_PROC_RESOLVE)
 msgid "Are you sure you want to mark the conflicted file(s) as resolved?"
@@ -1916,7 +1917,7 @@ msgstr "Marcare il/i file in conflitto come risolti?"
 msgid ""
 "Are you sure you want to revert %d item(s)? You will lose ALL changes since "
 "the last update!"
-msgstr ""
+msgstr "Vuoi davvero ripristinare %d elemento/i? Perderai TUTTE le modifiche a partire dall'ultimo aggiornamento!"
 #. Resource IDs: (IDS_WARNUSERSAFEDIFFERENT)
 #, c-format
@@ -1934,16 +1935,16 @@ msgstr "Assegnato all'elenco modifiche '%s'"
 #. Resource IDs: (IDS_MENUASSUMEVALID)
 msgid "Assume Unchanged"
-msgstr ""
+msgstr "Assumi come non modificato"
 #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 11027,
 #. IDS_PATHACTIONS_ASSUMEUNCHANGED)
 msgid "Assume valid/unchanged"
-msgstr ""
+msgstr "Assumi come valido/non modificato"
 #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 1550)
 msgid "Assume valid/unchanged (\"Needs-lock\" in TortoiseSVN)"
-msgstr ""
+msgstr "Assumi come valido/non modificato (\"Richiede-lock\" in TortoiseSVN)"
 #. Resource IDs:
 #. (ID_VIEW_DETECT_MOVED_OR_COPIED_LINES_FROM_EXISTING_FILES_AT_FILE_CREATION
@@ -1963,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."
@@ -1986,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)
@@ -2007,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"
@@ -2027,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"
@@ -2055,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"
@@ -2069,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"
@@ -2116,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:"
@@ -2124,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"
@@ -2172,11 +2173,11 @@ 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"
-msgstr ""
+msgstr "Biasima la revisione precedente"
 #. Resource IDs: (IDS_MENUDESCBLAME)
 msgid "Blames each line of a file on an author"
@@ -2228,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)"
@@ -2244,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:"
@@ -2351,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"
@@ -2455,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."
@@ -2479,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 ""
@@ -2516,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
@@ -2563,7 +2564,7 @@ msgstr "Controllo aggiornamenti"
 #. Resource IDs: (Dialog IDD_CHECKFORUPDATES: Control id 174)
 msgid "Check For Updates - TortoiseGit"
-msgstr ""
+msgstr "Controllo aggiornamenti - TortoiseGit"
 #. Resource IDs: (Dialog IDD_ABOUT: Control id 1031)
 msgid "Check For Updates..."
@@ -2862,7 +2863,7 @@ msgstr ""
 #. Resource IDs: (IDS_REPOBROWSEASKSUBMODULEUPDATE)
 #, c-format
 msgid "Commit %s not found in \"%s\". Update submodule now?"
-msgstr ""
+msgstr "Commit %s non trovato in \"%s\". Aggiornare il submodule ora?"
 #. Resource IDs: (IDS_COMMIT_COMMITPUSH)
 msgid "Commit && &Push"
@@ -2870,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"
@@ -2882,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"
@@ -2931,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 ""
@@ -2943,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)
@@ -3861,7 +3862,7 @@ msgstr ""
 #. Resource IDs: (IDS_DISABLEUPDATECHECKSBUTTON)
 msgid "Disable update checks"
-msgstr ""
+msgstr "Disattiva il controllo degli aggiornamenti."
 #. Resource IDs: (IDS_DETECT_MOVED_OR_COPIED_LINES_DISABLED)
 msgid "Disabled"
@@ -3954,11 +3955,11 @@ msgid ""
 "Do you really want to disable automatic update checks for TortoiseGit?\n"
 "\n"
 "Automatic update checks can be re-enabled in TortoiseGit settings on the General page."
-msgstr ""
+msgstr "Vuoi davvero disattivare il controllo automatico per gli aggiornamenti di TortoiseGit?\n\nIl controllo automatico per gli aggiornamenti può essere riattivato nelle impostazioni di TortoiseGit, dalla pagina Generale."
 #. Resource IDs: (IDS_PROC_MARK_ASSUMEVALID)
 msgid "Do you really want to mark the selected file(s) as assume-valid?"
-msgstr ""
+msgstr "Marcare i(l) file selezionato/i come assumi-valido?"
 #. Resource IDs: (IDS_PROC_MARK_SKIPWORKTREE)
 msgid "Do you really want to mark the selected file(s) as skip-worktree?"
@@ -4676,7 +4677,7 @@ msgstr "Recuperare"
 #. Resource IDs: (IDS_PROC_SYNC_FETCHREBASE)
 msgid "Fetch && Re&base"
-msgstr ""
+msgstr "Recupera ed esegui Re&base"
 #. Resource IDs: (IDS_PROC_SYNC_FETCHALL)
 msgid "Fetch all refs"
@@ -4684,24 +4685,24 @@ msgstr ""
 #. Resource IDs: (IDS_MENUDESCFETCH)
 msgid "Fetch commits from a remote repository."
-msgstr ""
+msgstr "Recupera commit da un repository remoto"
 #. Resource IDs: (IDS_MENUDESCSVNFETCH)
 msgid "Fetch from SVN repository"
-msgstr ""
+msgstr "Recupera da un repository SVN"
 #. Resource IDs: (IDS_PROC_BROWSEREFS_FETCHFROM)
 #, c-format
 msgid "Fetch from \"%s\""
-msgstr ""
+msgstr "Recupera da \"%s\""
 #. Resource IDs: (IDS_LOG_FETCHINGSTATUS)
 msgid "Fetching Status..."
-msgstr ""
+msgstr "Recupero dello stato..."
 #. Resource IDs: (IDS_PROC_LOG_FETCHINGFILES)
 msgid "Fetching changed files..."
-msgstr ""
+msgstr "Recupero dei file modificati..."
 #. Resource IDs: (IDS_GETVERSIONOFFILETITLE)
 msgid "Fetching file..."
@@ -5782,7 +5783,7 @@ msgstr "Se selezionato TortoiseGit controlla, una volta alla settimana, la dispo
 msgid ""
 "If enabled, working tree folders which are excluded from\n"
 "showing overlays still show the overlay for status 'normal'"
-msgstr ""
+msgstr "Se abilitato, le cartelle dell'albero di lavoro che sono escluse dalla visualizzazione\ndegli overlay mostreranno comunque l'overlay per lo stato 'normale'"
 #. Resource IDs: (IDS_SETTINGS_UNVERSIONEDRECURSE_TT)
 msgid ""
@@ -6317,7 +6318,7 @@ msgstr ""
 msgid ""
 "Local changes ignored (assumed valid/unchanged or skip worktree flagged "
 "files)"
-msgstr ""
+msgstr "Modifiche locali ignorate (file assunti come validi/non modificati, o marcati come skip-worktree)"
 #. Resource IDs: (IDS_TAGCOMPARE_LOCALMESSAGE)
 msgid "Local message"
@@ -8504,7 +8505,7 @@ msgstr "SVN DCommit..."
 #. Resource IDs: (IDS_MENUSVNFETCH)
 msgid "SVN Fetch"
-msgstr ""
+msgstr "Recupera da SVN"
 #. Resource IDs: (IDS_MENUSVNREBASE)
 msgid "SVN Rebase"
@@ -11604,7 +11605,7 @@ msgstr "e supporta gli sviluppatori"
 #. Resource IDs: (IDS_SETTINGS_READONLYNAME)
 msgid "assume-valid"
-msgstr ""
+msgstr "assumi-valido"
 #. Resource IDs: (IDS_STATGRAPH_COMMITSBYAUTHORX)
 msgid "author"

--- a/Tortoise_ru.po
+++ b/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 Shapkin <arkadiy_s@inbox.ru>, 2011
-# Arkady “KindDragon” Shapkin <arkadiy_s@inbox.ru>, 2011
+# Arkady Shapkin <arkadiy_s@inbox.ru>, 2011
-# Arkady “KindDragon” 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"
+"PO-Revision-Date: 2018-02-07 15:49+0000\n"
-"Last-Translator: Sven Strickroth <sstrickroth@googlemail.com>\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"

--- a/Tortoise_zh_CN.po
+++ b/Tortoise_zh_CN.po
@@ -16,15 +16,15 @@
 # Sven Strickroth <sstrickroth@googlemail.com>, 2012-2013,2017
 # weicong <weicong@live.cn>, 2013
 # YF <yfdyh000@gmail.com>, 2013,2016
-# YF <yfdyh000@gmail.com>, 2013-2017
+# YF <yfdyh000@gmail.com>, 2013-2018
 # 乙酸鋰 <ch3cooli@gmail.com>, 2014
 msgid ""
 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"
+"PO-Revision-Date: 2018-02-07 10:40+0000\n"
-"Last-Translator: Sven Strickroth <sstrickroth@googlemail.com>\n"
+"Last-Translator: YF <yfdyh000@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/lznuaa/tortoisegit/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -707,7 +707,7 @@ msgstr "生成 PuTTY 密钥对(&G)"
 #. Resource IDs: (65535 - PopupMenu)
 msgid "&Git"
-msgstr ""
+msgstr "&Git"
 #. Resource IDs: (Dialog IDD_SVNDCOMMITTYPE: Control id 2153)
 msgid "&Git Style Commit (--rmdir)"
@@ -751,7 +751,7 @@ msgstr "隐藏 (&H)"
 #. Resource IDs: (cmdShowFileList_LabelTitle_RESID)
 msgid "&Hide/Show the patch file list"
-msgstr ""
+msgstr "隐藏/显示补丁文件列表(&H)"
 #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 1170)
 msgid "&Icon Set:"
@@ -1571,7 +1571,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"
@@ -2311,7 +2311,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
@@ -3010,7 +3010,7 @@ msgstr "配置类型:"
 #. Resource IDs: (cmdRegexFilterConfig2_LabelTitle_RESID)
 msgid "Configure Filter Regex"
-msgstr ""
+msgstr "配置正则筛选器"
 #. Resource IDs: (IDS_CONFIGUREREGEXES, ID_REGEXFILTER - Menu)
 msgid "Configure Filter Regexes"
@@ -3349,7 +3349,7 @@ msgstr "创建标签(&T)..."
 #. Resource IDs: (cmdCreateUnifiedDiff_LabelTitle_RESID)
 msgid "Create &patch file"
-msgstr ""
+msgstr "创建补丁文件(&P)"
 #. Resource IDs: (Dialog IDD_SVNIGNORE: Control id 1641)
 msgid "Create .gitignore file"
@@ -4144,7 +4144,7 @@ msgstr "Dumy Group For 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"
@@ -4551,7 +4551,7 @@ msgstr "外部程序: "
 #. Resource IDs: (cmdFind_Keytip_RESID)
 msgid "F"
-msgstr ""
+msgstr "F"
 #. Resource IDs: (IDS_MENUFETCH)
 msgid "F&etch..."
@@ -4836,7 +4836,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)
@@ -4905,11 +4905,11 @@ msgstr "第一个问题版本(&B):"
 #. 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"
@@ -4921,7 +4921,7 @@ msgstr "适合图像宽度(&W)\tW"
 #. Resource IDs: (ID_VIEW_ZOOMWIDTH - Menu)
 msgid "Fit width"
-msgstr ""
+msgstr "适合宽度"
 #. Resource IDs: (Dialog IDD_SETTINGSTBLAME: Control id 1675)
 msgid "Follow renames"
@@ -5073,7 +5073,7 @@ msgstr "在“对话框组三”页面有更多有关“提交”对话框的选
 #. Resource IDs: (cmdGotoLine_Keytip_RESID)
 msgid "G"
-msgstr ""
+msgstr "G"
 #. Resource IDs: (IDS_VIEW_SHOWGRAVATAR)
 msgid "G&ravatar"
@@ -6059,7 +6059,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"
@@ -6101,7 +6101,7 @@ msgstr "韩语"
 #. Resource IDs: (cmdViewWrapLines_Keytip_RESID)
 msgid "L"
-msgstr ""
+msgstr "L"
 #. Resource IDs: (Dialog IDD_CLONE: Control id 1847)
 msgid "LFS"
@@ -6334,7 +6334,7 @@ msgstr "定位工具栏"
 #. Resource IDs: (cmdViewLocatorBar_LabelTitle_RESID)
 msgid "Locator bar"
-msgstr ""
+msgstr "位置栏"
 #. Resource IDs: (Dialog IDD_SETTINGSTBLAME: Control id 65535, IDS_LOG)
 msgid "Log"
@@ -6622,15 +6622,15 @@ msgstr "我的文件:"
 #. Resource IDs: (cmdNavigateNextConflict_Keytip_RESID)
 msgid "NC"
-msgstr ""
+msgstr "NC"
 #. Resource IDs: (cmdNavigateNextDifference_Keytip_RESID)
 msgid "ND"
-msgstr ""
+msgstr "ND"
 #. Resource IDs: (cmdNavigateNextInlineDiff_Keytip_RESID)
 msgid "NI"
-msgstr ""
+msgstr "NI"
 #. Resource IDs: (59138)
 msgid "NUM"
@@ -6812,7 +6812,7 @@ msgstr "在上次提交后没有添加或更改过文件。\n要显示未受版
 #. Resource IDs: (33002)
 msgid "No filter"
-msgstr ""
+msgstr "无过滤"
 #. Resource IDs: (IDS_PROC_NOMSYSGIT)
 msgid ""
@@ -7232,7 +7232,7 @@ msgstr "原名称"
 #. Resource IDs: (IDS_VIEW_SHOWROTHERLABELS)
 msgid "Other refs"
-msgstr ""
+msgstr "其他引用"
 #. Resource IDs: (IDS_STATGRAPH_OTHERGROUP)
 msgid "Others"
@@ -7272,15 +7272,15 @@ msgstr "页面设置(&A)..."
 #. Resource IDs: (cmdNavigatePreviousConflict_Keytip_RESID)
 msgid "PC"
-msgstr ""
+msgstr "PC"
 #. Resource IDs: (cmdNavigatePreviousDifference_Keytip_RESID)
 msgid "PD"
-msgstr ""
+msgstr "PD"
 #. Resource IDs: (cmdNavigatePreviousInlineDiff_Keytip_RESID)
 msgid "PI"
-msgstr ""
+msgstr "PI"
 #. Resource IDs: (AFX_IDS_PRINTPAGENUM)
 #, c-format
@@ -7490,7 +7490,7 @@ msgid ""
 "Please see the <a id=\"manual\">manual</a> for general hints. E.g. in most "
 "dialogs there are some shared shortcuts such as F5 for refresh or CTRL+F for"
 " search and oftentimes there are powerful context menus."
-msgstr ""
+msgstr "请阅读<a id=\"manual\">手册</a>了解一般性提示。例如，大多数对话框中有一些普遍的快捷方式，如 F5 代表刷新，CTRL+F 调用搜索/查找，以及很多地方有强大的上下文菜单（右键菜单）。"
 #. Resource IDs: (IDS_ERR_NOHOOKTYPESPECIFIED)
 msgid "Please select a hook type"
@@ -7765,7 +7765,7 @@ msgstr "引号包裹路径"
 #. Resource IDs: (cmdReload_Keytip_RESID)
 msgid "R"
-msgstr ""
+msgstr "R"
 #. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1073)
 msgid "R&AM drives"
@@ -8097,7 +8097,7 @@ msgstr "移除陈旧的锁文件"
 #. Resource IDs: (Dialog IDD_CLEAN: Control id 1631)
 msgid "Remove unmanaged directories with .git folder (-f)"
-msgstr ""
+msgstr "移除 .git 文件夹未管理的目录 (-f)"
 #. Resource IDs: (Dialog IDD_CLEAN: Control id 1626)
 msgid "Remove untracked directories (-d)"
@@ -8425,7 +8425,7 @@ msgstr "运行，当工作树路径位于："
 #. Resource IDs: (cmdSave_Keytip_RESID)
 msgid "S"
-msgstr ""
+msgstr "S"
 #. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET:
 #. Control id 1383)
@@ -8549,7 +8549,7 @@ msgstr "保存"
 #. Resource IDs: (cmdSaveAs_LabelTitle_RESID)
 msgid "Save &as"
-msgstr ""
+msgstr "另存为(&A)"
 #. Resource IDs: (IDS_REPOBROWSE_SAVEAS, ID_FILE_SAVE_AS - Menu)
 msgid "Save &as..."
@@ -9555,7 +9555,7 @@ msgstr "策略"
 #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1406)
 msgid "Strip lines starting with \"#\" in commit message"
-msgstr "条带化以 \"#\" 开头的提交信息"
+msgstr "剥离提交信息中以 # 开头的行"
 #. Resource IDs: (IDS_LOG_FILTER_SUBJECT, IDS_SUBJECT)
 msgid "Subject"
@@ -10259,7 +10259,7 @@ msgid ""
 "have a look into its settings dialog. The settings dialog is reachable using"
 " the start menu or the context menu of the Windows Explorer: TortoiseGit -> "
 "Settings."
-msgstr ""
+msgstr "这里是首次启动向导，我将帮助您配置基本设置。TortoiseGit 高度可配置，因此推荐您查看了解其配置对话框。使用开始菜单或者 Windows 文件资源管理器中的右键菜单 -> TortoiseGit -> 设置 即可访问设置对话框。"
 #. Resource IDs: (IDS_PROC_LOG_ONLYONCE)
 msgid ""
@@ -10492,7 +10492,7 @@ msgid ""
 " agent for caching the password (done automatically if a PuTTY key is "
 "configured for a remote). For advanced tips & tricks see our <a "
 "id=\"manual\">manual</a> and <a id=\"sshfaq\">FAQ</a>."
-msgstr ""
+msgstr "TortoiseGitPlink 是推荐的 SSH 客户端。如果您还没有一个密钥对，那么应该生成一个。请确保信息安全私密，并将公钥设置在您的托管平台上。为缓存密码使用 PuTTY 身份验证代理（如果已为一个远端配置了 PuTTY 密钥则会自动完成）。有关高级提示和技巧，请阅读我们的<a id=\"manual\">手册</a> 和<a id=\"sshfaq\">常见问题</a>。"
 #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 357, IDS_APP_TITLE)
 msgid "TortoiseGitUDiff"
@@ -10689,7 +10689,7 @@ msgstr "未知"
 #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 65535)
 msgid "Unknown ref-types"
-msgstr ""
+msgstr "未知 ref-types"
 #. Resource IDs: (IDS_VIEWCONTEXTMENU_UNMARKBLOCK)
 msgid "Unmark this block"
@@ -11030,7 +11030,7 @@ msgstr "为高权限进程使用 'none' 状态缓存类型"
 #. Resource IDs: (cmdPaste_Keytip_RESID)
 msgid "V"
-msgstr ""
+msgstr "V"
 #. Resource IDs: (IDS_COMMANDLINEHELP)
 msgid ""
@@ -11138,7 +11138,7 @@ msgstr "浏览我们的网站"
 #. Resource IDs: (cmdShowWhitespaces_Keytip_RESID)
 msgid "W"
-msgstr ""
+msgstr "W"
 #. Resource IDs: (Dialog IDD_SETTINGS_CONFIG: Control id 65535)
 msgid ""
@@ -11176,7 +11176,7 @@ msgid ""
 "We hope you enjoy using TortoiseGit! In case of questions or problems, "
 "please consult our manual or go to <a "
 "id=\"support\">https://tortoisegit.org/support/</a>"
-msgstr ""
+msgstr "我们希望您喜欢用 TortoiseGit！。如有疑问或问题，请查阅我们的手册，或造访 <a id=\"support\">https://tortoisegit.org/support/</a>"
 #. Resource IDs: (IDS_FIRSTSTART_STARTTITLE)
 msgid "Welcome to TortoiseGit!"
@@ -11248,7 +11248,7 @@ msgid ""
 "If you want to abort the merge, do a hard reset on HEAD or select abort merge on the context menu.\n"
 "\n"
 "See help for more information."
-msgstr ""
+msgstr "在合并（即另一个远端分支的变更集整合到本地的分支）时有至少一个文件发生了冲突。您需要手动解决此问题，即将您的修改整合在另一个分支的修改上。\n\n在解决所有文件后，您需要进行一次提交以完成合并。\n\n如果您想中止合并，在 HEAD 上进行一次硬重置，或在右键菜单中选择中止合并。\n\n更多信息请参阅帮助。"
 #. Resource IDs: (IDS_DAEMON_SECURITY_WARN)
 msgid ""
@@ -11323,7 +11323,7 @@ msgstr "工作树变更"
 #. Resource IDs: (cmdViewWrapLines_LabelTitle_RESID)
 msgid "Wrap Lines"
-msgstr ""
+msgstr "自动换行"
 #. Resource IDs: (ID_VIEW_WRAPLONGLINES - Menu)
 msgid "Wrap long lines"
@@ -11337,7 +11337,7 @@ msgstr "在右边视图边界换行\n换行"
 #. Resource IDs: (cmdRedo_Keytip_RESID)
 msgid "Y"
-msgstr ""
+msgstr "Y"
 #. Resource IDs: (IDS_PROC_YESTOALL)
 msgid "Yes to all"
@@ -11464,7 +11464,7 @@ msgstr "您的版本是: %d.%d.%d.%d"
 #. Resource IDs: (cmdUndo_Keytip_RESID)
 msgid "Z"
-msgstr ""
+msgstr "Z"
 #. Resource IDs: (IDS_ARCHIVEFILEFILTER)
 msgid "ZIP archive (*.zip)|*.zip|All Files (*.*)|*.*||"
@@ -11513,7 +11513,7 @@ msgstr "缩小"
 #. Resource IDs: (ID_VIEW_ZOOM100 - Menu)
 msgid "Zoom to &100%"
-msgstr ""
+msgstr "缩放为 &100%"
 #. Resource IDs: (32804)
 msgid "Zoom to fit"
@@ -11850,7 +11850,7 @@ msgstr "未初始化"
 #. Resource IDs: (cmdOpen_Keytip_RESID)
 msgid "o1"
-msgstr ""
+msgstr "o1"
 #. Resource IDs: (IDS_STATUSOBSTRUCTED)
 msgid "obstructed"
No results found