From 3ca672c0fb0825b9962dc46ba3bbfd1244b94482 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 31 Mar 2021 19:26:43 +0200 Subject: [PATCH] Sync translations with Transifex Signed-off-by: Sven Strickroth --- Languages/Tortoise_bg.po | 203 ++++++++++---------- Languages/Tortoise_ca.po | 367 +++++++++++++++++------------------ Languages/Tortoise_cs.po | 213 ++++++++++---------- Languages/Tortoise_da.po | 203 ++++++++++---------- Languages/Tortoise_de.po | 209 ++++++++++---------- Languages/Tortoise_el.po | 205 ++++++++++---------- Languages/Tortoise_es.po | 219 ++++++++++----------- Languages/Tortoise_fa.po | 203 ++++++++++---------- Languages/Tortoise_fi.po | 203 ++++++++++---------- Languages/Tortoise_fr.po | 231 +++++++++++----------- Languages/Tortoise_hu.po | 236 ++++++++++++----------- Languages/Tortoise_id.po | 203 ++++++++++---------- Languages/Tortoise_it.po | 264 ++++++++++++------------- Languages/Tortoise_ja.po | 244 +++++++++++------------ Languages/Tortoise_ko.po | 427 +++++++++++++++++++++-------------------- Languages/Tortoise_lt.po | 203 ++++++++++---------- Languages/Tortoise_nl.po | 209 ++++++++++---------- Languages/Tortoise_oc.po | 203 ++++++++++---------- Languages/Tortoise_pl.po | 355 +++++++++++++++++----------------- Languages/Tortoise_pt_BR.po | 221 ++++++++++----------- Languages/Tortoise_pt_PT.po | 203 ++++++++++---------- Languages/Tortoise_ro.po | 211 ++++++++++---------- Languages/Tortoise_ru.po | 236 ++++++++++++----------- Languages/Tortoise_sk.po | 203 ++++++++++---------- Languages/Tortoise_sl.po | 205 ++++++++++---------- Languages/Tortoise_sq.po | 199 +++++++++---------- Languages/Tortoise_sr@Cyrl.po | 203 ++++++++++---------- Languages/Tortoise_sr@latin.po | 203 ++++++++++---------- Languages/Tortoise_sv.po | 211 ++++++++++---------- Languages/Tortoise_tr.po | 203 ++++++++++---------- Languages/Tortoise_uk.po | 203 ++++++++++---------- Languages/Tortoise_vi.po | 203 ++++++++++---------- Languages/Tortoise_zh_CN.po | 227 +++++++++++----------- Languages/Tortoise_zh_TW.po | 221 ++++++++++----------- 34 files changed, 3930 insertions(+), 3822 deletions(-) diff --git a/Languages/Tortoise_bg.po b/Languages/Tortoise_bg.po index 8ec4b3da6..94c7b6d0e 100644 --- a/Languages/Tortoise_bg.po +++ b/Languages/Tortoise_bg.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -16,7 +16,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Bulgarian (http://www.transifex.com/lznuaa/tortoisegit/language/bg/)\n" "MIME-Version: 1.0\n" @@ -1846,6 +1846,10 @@ msgstr "" msgid "Already up to date." msgstr "Вече е последна версия." +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "" @@ -2113,10 +2117,6 @@ msgstr "Чувствителност към регистъра за именат msgid "Auto CrLf convert" msgstr "" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2143,6 +2143,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "Автоматичното дописване подсказва думи (обикновено имена на класове или членове)\nот файловете, които сте променили, докато пишете съобщение за дневника." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "" @@ -2917,6 +2921,18 @@ msgstr "" msgid "Colors" msgstr "Цветове" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3193,6 +3209,14 @@ msgstr "Конфликти" msgid "Conflicts: %d" msgstr "Конфликти: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "" @@ -3315,9 +3339,9 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3548,6 +3572,10 @@ msgstr "Създава Unified Diff с всички промени, които msgid "Creating pull-request..." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "" @@ -3866,6 +3894,18 @@ msgstr "Размер и позиция на диалоговите прозор msgid "Dialogs" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "" @@ -3882,10 +3922,6 @@ msgstr "" msgid "Diff Viewer" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "" @@ -4375,7 +4411,7 @@ msgstr "" msgid "Either the name or IP of the proxy server" msgstr "Името или IP адреса на proxy сървъра" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "Email" @@ -5149,15 +5185,15 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5261,42 +5297,6 @@ msgstr "" msgid "General" msgstr "Общо" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "Общо::Цветове 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "Общо::Цветове 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "Общо::Цветове 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Общо::Контекстно меню" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "Общо::Контекстно меню 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Общо::Диалогови прозорци 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Общо::Диалогови прозорци 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Общо::Диалогови прозорци 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Получаване на дневниците за сливанията" @@ -5425,14 +5425,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5610,14 +5602,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Закачени скриптове" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Закачени скриптове::Интеграция с програми за проследяване на дефекти" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Тип на кука" @@ -5889,12 +5873,8 @@ msgid "Icon Overlays" msgstr "Модификации на иконките" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Модификации на иконките::Комплект с иконки" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Модификации на иконките::Налични модификации" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6124,7 +6104,7 @@ msgid "Importing file %s" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6197,7 +6177,7 @@ msgstr "Вмъква съдържанието на системния буфер #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6222,6 +6202,14 @@ msgstr "Невалидна валута." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6702,6 +6690,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "Сливане / повторна интеграция" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6873,10 +6865,6 @@ msgstr "Вмъкнат" msgid "Network" msgstr "Мрежа" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Нов" @@ -7153,7 +7141,7 @@ msgstr "Имайте предвид, че, ако решите да възста #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7470,7 +7458,7 @@ msgid "Others" msgstr "Други" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7489,6 +7477,10 @@ msgstr "Изходна директория:" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "" @@ -7913,14 +7905,11 @@ msgid "Proxy Settings" msgstr "Настройки на proxy сървъра" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "Дърпане" @@ -8162,14 +8151,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8246,7 +8239,8 @@ msgstr "" msgid "Reminder: Commit your change after resolve" msgstr "" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "Отдалечено" @@ -8769,8 +8763,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9232,7 +9226,7 @@ msgid "Show" msgstr "Показване" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9405,8 +9399,8 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "&Номерация на редовете" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10226,6 +10220,10 @@ msgstr "Файлът е прекалено голям" msgid "The file is too large to open." msgstr "Този файл е прекалено голям, за да бъде отворен." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10729,12 +10727,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10855,7 +10853,7 @@ msgid "Trim right" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11104,7 +11102,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11689,6 +11687,11 @@ msgstr "Вече имате инсталирана най-новата верс msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_ca.po b/Languages/Tortoise_ca.po index 6191f3572..ac60e1fca 100644 --- a/Languages/Tortoise_ca.po +++ b/Languages/Tortoise_ca.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -9,7 +9,7 @@ # el_libre como el chaval , 2011 # Haommin , 2014 # Joan Monguillot , 2013 -# Joan Monguillot , 2013,2016-2018 +# Joan Monguillot , 2013,2016-2018,2020-2021 # el_libre como el chaval , 2011 # Lübbe Onken , 2013 # Lübbe Onken , 2013 @@ -20,8 +20,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: 2020-10-07 09:37+0000\n" -"Last-Translator: Sven Strickroth \n" +"PO-Revision-Date: 2021-03-28 10:13+0000\n" +"Last-Translator: Joan Monguillot \n" "Language-Team: Catalan (http://www.transifex.com/lznuaa/tortoisegit/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -329,7 +329,7 @@ msgstr "&Avorta" msgid "" "&Abort\n" "You can fix the reason the hook script failed first." -msgstr "" +msgstr "&Interromp\nPodeu resoldre el motiu pel qual ha fallat l'script hook." #. Resource IDs: (ID_APP_ABOUT - Menu) msgid "&About TortoiseGitBlame..." @@ -482,7 +482,7 @@ msgstr "&Compara revisions" #. Resource IDs: (IDS_LOG_POPUP_COMPAREWITHPREVIOUS) msgid "&Compare with previous revision" -msgstr "" +msgstr "&Compara amb revisió anterior" #. Resource IDs: (IDS_WALKBEHAVIOUR_COMPRESSED) msgid "&Compressed Graph" @@ -512,11 +512,11 @@ msgstr "&Personalitzat" #. Resource IDs: (ID_VIEW_DARKMODE - Menu) msgid "&Dark Mode" -msgstr "" +msgstr "Mode &fosc" #. Resource IDs: (ID_VIEW_DARKMODE - Menu) msgid "&Dark Mode\tD" -msgstr "" +msgstr "Mode &fosc\tD" #. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1269) msgid "&Default" @@ -537,11 +537,11 @@ msgstr "&Suprimir Filtre" #. Resource IDs: (IDS_PROC_DELETEREMOTEBRANCH_LOCALREMOTE) msgid "&Delete branch on remote && local remote-tracking branch" -msgstr "" +msgstr "&Suprimeix la branca en remot && branca rastrejadora en remot local" #. Resource IDs: (IDS_DELETE_BRANCHTAG) msgid "&Delete branch/tag" -msgstr "" +msgstr "&Elimina branca/etiqueta" #. Resource IDs: (65535 - PopupMenu) msgid "&Detect moved or copied lines" @@ -583,7 +583,7 @@ msgstr "&No m'ho preguntis més" msgid "" "&Don't run\n" "Do not run the script" -msgstr "" +msgstr "&No executar\nNo executar l'script" #. Resource IDs: (IDS_MSGBOX_DONOTSHOWAGAIN) msgid "&Don't show this message again" @@ -895,7 +895,7 @@ msgstr "&Fusiona" #. Resource IDs: (IDS_LOG_POPUP_MERGEREV) #, c-format msgid "&Merge to \"%s\"..." -msgstr "" +msgstr "&Fusiona cap a \"%s\"..." #. Resource IDs: (IDS_MERGE_UNRELATED) msgid "&Merge unrelated history" @@ -1051,7 +1051,7 @@ msgstr "&Continua" msgid "" "&Proceed anyway\n" "Ignore the hook script and run the command anyway." -msgstr "" +msgstr "&Continua de totes maneres\nIgnora l'script hook i executa l'ordre de totes maneres." #. Resource IDs: (IDS_PROC_SYNC_PULL) msgid "&Pull" @@ -1161,7 +1161,7 @@ msgstr "Restitueix els canvis fets per aquestes entregues" msgid "" "&Run\n" "Run the hook script" -msgstr "" +msgstr "&Executa\nExecuta l'script hook" #. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 65535) msgid "&SSH client:" @@ -1244,7 +1244,7 @@ msgstr "&Barra d'Estat" #. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 1849) msgid "&Store credentials..." -msgstr "" +msgstr "&Emmagatzema credencials..." #. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1525) msgid "&Switch to new branch" @@ -1332,7 +1332,7 @@ msgstr "&Unitats desconegudes" #. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 32927) msgid "&Unlock" -msgstr "" +msgstr "Desbloqueja" #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" @@ -1708,11 +1708,11 @@ msgstr "Voleu afegir una altra entrega?" #. Resource IDs: (IDS_STATUSLIST_CONTEXT_ADD_EXE) msgid "Add as Executable (+x)" -msgstr "" +msgstr "Afegeix com executable (+x)" #. Resource IDs: (IDS_STATUSLIST_CONTEXT_ADD_LINK) msgid "Add as Symlink" -msgstr "" +msgstr "Afegeix com a Symlink" #. Resource IDs: (IDS_DLGTITLE_ADD_DIFF_TOOL) msgid "Add extension specific diff program" @@ -1850,6 +1850,10 @@ msgstr "Permet crear una entrega buida que només té missatge d'entrega sense f msgid "Already up to date." msgstr "Ja està al dia" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "Empeny sempre aquesta branca local a l'arxiu remot seleccionat" @@ -1960,7 +1964,7 @@ msgstr "Aplicar Comparació unificada" #. Resource IDs: (IDS_HOOKS_APPROVE_TASK2) msgid "Approve or reject client-side hook script" -msgstr "" +msgstr "Aprova o rebutja l'script hook al costat client" #. Resource IDs: (65535 - PopupMenu) msgid "Arabic" @@ -2005,7 +2009,7 @@ msgstr "Organitza &verticalment\tV" #. Resource IDs: (ID_VIEW_ARROW_POINT_TO_MERGES - Menu) msgid "Arrows point towards merges" -msgstr "" +msgstr "Les fletxes apunten cap a les fusions" #. Resource IDs: (IDS_SVNACTION_CHANGELISTSET) #, c-format @@ -2117,13 +2121,9 @@ msgstr "Autors distingint Majusc./minúsc." msgid "Auto CrLf convert" msgstr "Auto convertir CrLf" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" -msgstr "" +msgstr "Auto&CrLf:" #. Resource IDs: (IDS_PROGRS_CLOSE_NOCONFLICTS) msgid "Auto-close if no conflicts" @@ -2147,6 +2147,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "Auto-completa suggereix paraules (normalment noms de classes o membres)\ndels fitxers que heu canviat quan escriviu un text de registre." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "AutoCrLf:" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "Auto-carrega clau Putty" @@ -2268,7 +2272,7 @@ msgstr "Barreja alpha" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1852) msgid "Block TortoiseGit while executing the external merge tool" -msgstr "" +msgstr "Bloqueja el TortoiseGit durant l'execució de l'eina de fusió externa" #. Resource IDs: (cmdGroupBlocks_LabelTitle_RESID) msgid "Blocks" @@ -2414,7 +2418,7 @@ msgstr "Entrega" #. Resource IDs: (IDS_LOG_POPUP_COMMIT) msgid "C&ommit..." -msgstr "" +msgstr "Entrega..." #. Resource IDs: (IDS_LOG_POPUP_COPY) msgid "C&reate branch/tag from revision" @@ -2706,11 +2710,11 @@ msgstr "Extreu amb fusió" #. Resource IDs: (IDS_CHERRY_PICK_VERSIONS) msgid "Cherr&y Pick selected commits..." -msgstr "" +msgstr "Escull entregues seleccionades..." #. Resource IDs: (IDS_CHERRY_PICK_VERSION) msgid "Cherr&y Pick this commit..." -msgstr "" +msgstr "Escull aquesta entrega..." #. Resource IDs: (IDS_PROGS_TITLE_CHERRYPICK) msgid "Cherry Pick" @@ -2724,7 +2728,7 @@ msgstr "La tria ha fracassat" msgid "" "Cherry-pick failed (please see log in the cherry pick/rebase dialog for " "details)! Skip this commit?" -msgstr "" +msgstr "Ha fallat la tria (vegeu detalls al registres del diàleg cherry pick/rebase). Ometre aquesta entrega?" #. Resource IDs: (65535 - PopupMenu) msgid "Chinese" @@ -2921,10 +2925,22 @@ msgstr "Marca segons l'edat, &continu" msgid "Colors" msgstr "Colors" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "Colors 1" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "Colors 2" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "Colors 3" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" -msgstr "" +msgstr "Columna: %d" #. Resource IDs: (IDS_COMBINE_TO_ONE) msgid "Com&bine to one commit" @@ -2940,11 +2956,11 @@ msgstr "Comanda" #. Resource IDs: (IDS_SETTINGS_HOOKS_COMMANDLINECOL) msgid "Command Line" -msgstr "Línia de comandes" +msgstr "Línia d'ordre" #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1336) msgid "Command Line To Execute:" -msgstr "Comanda a Executar:" +msgstr "Línia d'ordre a executar:" #. Resource IDs: (AFX_IDP_COMMAND_FAILURE) msgid "Command failed." @@ -3130,7 +3146,7 @@ msgstr "Configurar Filtres regex" #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 236) msgid "Configure Hook Scripts" -msgstr "Configura scripts d'interconnexió" +msgstr "Configura scripts hook" #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQADV: Control id 284) msgid "Configure Issue Tracker Integration" @@ -3144,7 +3160,7 @@ msgstr "Configura editor alternatiu. Preferiblement un que permeti l'ús de fina #. Resource IDs: (IDS_CONFIGUREDEFAULT) msgid "Configure default" -msgstr "" +msgstr "Configura per defecte" #. Resource IDs: (IDS_FIRSTSTART_GITTITLE) msgid "Configure git.exe" @@ -3197,6 +3213,14 @@ msgstr "Conflictes" msgid "Conflicts: %d" msgstr "Conflictes: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "Menú contextual" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "Menú contextual 2" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "Línies de context per a pedaços" @@ -3319,10 +3343,10 @@ msgstr "No s'ha pogut trobar el super-projecte" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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 "No s'ha trobat \"msysgit\" o \"windows\" a la cadena de versió de git.exe.\nSi useu el git del Cygwin o de l'entorn msys2 cal activar uns hacks especials.\nVegeu més informació al fitxer d'ajuda amb la clau \"cygwin git\" o \"msys2 git\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) #, c-format @@ -3552,6 +3576,10 @@ msgstr "Crea un fitxer diff unificat amb tots els canvis que has fet" msgid "Creating pull-request..." msgstr "Creant sol·licitud d'estirada" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "Credencial" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "L'auxiliar de credencials no pot estar buit." @@ -3630,13 +3658,13 @@ msgstr "Dimoni" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 1699) msgid "Dark theme" -msgstr "" +msgstr "Tema fosc" #. Resource IDs: (IDS_DARKTHEME_TT) msgid "" "Dark theme requires at least Win10 1803, and it must be enabled in the " "Windows system settings." -msgstr "" +msgstr "El tema fosc necessita almenys Win10 1803, i cal activar-lo a la configuració de sistema del Windows." #. Resource IDs: (IDS_LOG_DATE, IDS_STATUSLIST_COLDATE) msgid "Date" @@ -3679,7 +3707,7 @@ msgstr "Elimina %d etiquetes" #. Resource IDs: (IDS_PROC_DELETEREMOTEBRANCH_LOCAL) msgid "Delete &local remote-tracking branch" -msgstr "" +msgstr "Suprimeix la branca rastrejadora en remot &local" #. Resource IDs: (IDS_REFLOG_DEL) msgid "Delete Ref..." @@ -3870,6 +3898,18 @@ msgstr "Mides i posicions dels formularis" msgid "Dialogs" msgstr "Diàlegs" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "Diàlegs 1" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "Diàlegs 2" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "Diàlegs 3" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Diff" @@ -3886,10 +3926,6 @@ msgstr "Diffs de dues entregues" msgid "Diff Viewer" msgstr "Visor de Diffs" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Visor de Diffs::Eina de fusió" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Línies afegides al comparador" @@ -4041,7 +4077,7 @@ msgstr "No em mostris més aquest avís (si prems Ignora)" #. Resource IDs: (IDS_HOOKS_APPROVE_TASK5) msgid "Do not ask again for this script" -msgstr "" +msgstr "No tornar a preguntar per aquest script" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1407) msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" @@ -4379,7 +4415,7 @@ msgstr "Efectiu" msgid "Either the name or IP of the proxy server" msgstr "Nom o IP del servidor intermediari" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "&Email:" @@ -4981,23 +5017,23 @@ msgstr "Troba" #. Resource IDs: (cmdFindNext_LabelTitle_RESID) msgid "Find Next" -msgstr "" +msgstr "Troba el següent" #. Resource IDs: (cmdFindPrev_LabelTitle_RESID) msgid "Find Previous" -msgstr "" +msgstr "Troba l'anterior" #. Resource IDs: (cmdFindPrev) msgid "" "Find the last occurrence of the selected text\n" "Search Previous" -msgstr "" +msgstr "Troba la darrera ocurrència del text seleccionat\nCerca l'anterior" #. Resource IDs: (cmdFindNext) msgid "" "Find the next occurrence of the selected text\n" "Search Next" -msgstr "" +msgstr "Troba la següent ocurrència del text seleccionat\nCerca el següent" #. Resource IDs: (57636, cmdFind) msgid "" @@ -5131,11 +5167,11 @@ msgstr "Força el rebase fins i tot si la branca actual és descendent de l'entr #. Resource IDs: (IDS_PROGS_LFS_FORCEUNLOCK) msgid "Force unlock" -msgstr "" +msgstr "Forçar desbloqueig" #. Resource IDs: (Dialog IDD_PUSH: Control id 1796) msgid "Force: May discard" -msgstr "Força: Es pot rebutjar" +msgstr "Forçar: Potser rebutja" #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) @@ -5153,16 +5189,16 @@ msgstr "Avança %d" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." -msgstr "S'ha trobat \"msysgit\" o \"windows\" a la cadena de versió de git.exe, però els hacks del git.exe estan activats. Cal desactivar aquests hacks per a un funcionament correcte del Git del Windows.\nVegeu més informació al fitxer d'ajuda amb la clau \"cygwin git\" o \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." +msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." -msgstr "S'ha trobat un fitxer de bloqueig indicant que s'està executant un procés de rebase del TortoiseGit. Això bloqueja aquesta operació.\n\nSi ara mateix no esteu executant un procés de rebase del TortoiseGit, per continuar podeu eliminar el fitxer de bloqueig." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) msgid "" @@ -5265,42 +5301,6 @@ msgstr "Recopilant estadístiques" msgid "General" msgstr "General" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "General::Editor Alternatiu" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "General::Colors 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "General::Colors 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "General::Colors 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "General:: Menú Contextual" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "General::Menú Contextual 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "General::Diàlegs 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "General::Diàlegs 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "General::Diàlegs 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Obté logs de Fusió" @@ -5429,14 +5429,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "El Git utilitza el concepte de configuració jeràrquica.\nHi ha múltiples nivells; la configuració a nivells superiors modifica els valors a nivells inferiors.\nLa pestanya \"Efectiu\" mostra els valors efectius a l'àmbit l'actual (només lectura).\nSeleccioneu qualsevol nivell per veure-hi els valors desats.\nPer modificar la configuració seleccioneu un nivell, introduïu els valors i seleccioneu on desar-los." -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "Git::Credencials" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "Git::Remot" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5575,7 +5567,7 @@ msgstr "Amaga pedaç<<" #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" -msgstr "Amaga el script mentres s'està executant" +msgstr "Amaga l'script mentre s'està executant" #. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 65535) msgid "Hide the selected items in the context menu:" @@ -5612,27 +5604,19 @@ msgstr "Consell: Els missatges d'entrega recents estan disponibles amb el menú #. Resource IDs: (Dialog IDD_SETTINGSHOOKS: Control id 103) msgid "Hook Scripts" -msgstr "Scripts d'interconnexió" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "Scripts d'interconnexió::Configuració del rastreig d'incidències" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Scripts d'interconnexió::Integració del Seguidor d'Incidències" +msgstr "Scripts hook" #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" -msgstr "Tipus d'interconnexió" +msgstr "Tipus de hook" #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1334) msgid "Hook Type:" -msgstr "Tipus d'interconnexió:" +msgstr "Tipus de hook:" #. Resource IDs: (IDS_HOOKFAILED_TASK2) msgid "Hook script failed" -msgstr "" +msgstr "Ha fallat l'script hook" #. Resource IDs: (Dialog IDD_FIRSTSTARTWIZARD_GIT: Control id 1841) msgid "I don't use Git for Windows and need special workarounds" @@ -5734,7 +5718,7 @@ msgstr "ID:32818:V +H" #. Accelerator Entry for Menu ID:32819; '&Dark Mode\tD' msgid "ID:32819:V +D" -msgstr "" +msgstr "ID:32819:V +D" #. Accelerator Entry for Menu ID:32822; '' msgid "ID:32822:V C +F" @@ -5893,12 +5877,8 @@ msgid "Icon Overlays" msgstr "Sobreposició d'icones" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Sobreposició d'icones::Conjunt d'icones" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Sobreposició d'icones::Conjunt d'icones" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6128,8 +6108,8 @@ msgid "Importing file %s" msgstr "Important arxiu %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" -msgstr "Llista de canvis rebuts" +msgid "In Changelist" +msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) msgid "In Commits" @@ -6137,7 +6117,7 @@ msgstr "Entregues rebudes" #. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1649) msgid "In order to abort a merge progress a reset (to HEAD) is needed." -msgstr "" +msgstr "Cal reinicialitzar (a HEAD) per interrompre la fusió en curs" #. Resource IDs: (IDS_FIRSTSTART_LANGUAGEHINT2) msgid "" @@ -6201,7 +6181,7 @@ msgstr "Insereix contingut del Porta-retalls\nEnganxa" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6226,6 +6206,14 @@ msgstr "Valor Monetari Incorrecte." msgid "Invalid revision number!" msgstr "El número de revisió no és vàlid!" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "Emissor:" @@ -6299,19 +6287,19 @@ msgstr "LFS" #. Resource IDs: (IDS_PROGRS_TITLE_LFS_LOCK) msgid "LFS Lock" -msgstr "" +msgstr "Bloqueig LFS" #. Resource IDs: (IDS_STATUSLIST_COLLFSLOCK) msgid "LFS Lock Owner" -msgstr "" +msgstr "Propietari bloqueig LFS" #. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 176) msgid "LFS Locks" -msgstr "" +msgstr "Bloquejos LFS" #. Resource IDs: (IDS_PROGRS_TITLE_LFS_UNLOCK) msgid "LFS Unlock" -msgstr "" +msgstr "Desbloqueig LFS" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 65535) msgid "LINE1" @@ -6548,11 +6536,11 @@ msgstr "Barra de localització" #. Resource IDs: (IDS_MENULFSLOCK, IDS_PROGRS_CMD_LFS_LOCK) msgid "Lock" -msgstr "" +msgstr "Bloqueig" #. Resource IDs: (IDS_MENUDESCLFSLOCK) msgid "Locks a file using LFS" -msgstr "" +msgstr "Bloqueja un fitxer amb LFS" #. Resource IDs: (Dialog IDD_SETTINGSTBLAME: Control id 65535, IDS_LOG) msgid "Log" @@ -6706,6 +6694,10 @@ msgstr "Punt de fusió" msgid "Merge Reintegrate" msgstr "Fusiona Reintegra" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6877,10 +6869,6 @@ msgstr "Imbricat" msgid "Network" msgstr "Xarxa" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "Xarxa::Correu electrònic" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Nou" @@ -7157,7 +7145,7 @@ msgstr "Avis: Si escull recuperar els documents auto-desats, heu de desar-los ex #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7474,8 +7462,8 @@ msgid "Others" msgstr "Altres" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" -msgstr "Canvis a enviar" +msgid "Out Changelist" +msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) msgid "Out Commits" @@ -7493,6 +7481,10 @@ msgstr "Directori de sortida" msgid "Output.prn" msgstr "Sortida.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "Sobreescriu" @@ -7712,13 +7704,13 @@ msgstr "Diagrama de sectors" #. Resource IDs: (IDS_ERR_NOHOOKCOMMANDPECIFIED) msgid "Please enter a hook script to execute." -msgstr "Introdueix un scripts d'interconnexió per executar." +msgstr "Introduïu un script hook per executar." #. Resource IDs: (IDS_ERR_NOHOOKPATHSPECIFIED) msgid "" "Please enter a path where to apply the hook script to. Use \"*\" for all " "paths." -msgstr "Introduïu un camí on aplicar l'script d'interconnexió. Useu \"*\" per a tots els camins." +msgstr "Introduïu un camí on aplicar l'script hook. Useu \"*\" per a tots els camins." #. Resource IDs: (IDS_GITCHANGED_NEEDRESTART) msgid "Please restart TortoiseGit for the changes of git.exe to take effect." @@ -7733,7 +7725,7 @@ msgstr "Vegeu manual per a consells generals. Per exemple, #. Resource IDs: (IDS_ERR_NOHOOKTYPESPECIFIED) msgid "Please select a hook type" -msgstr "Seleccioneu un tipus d'interconnexió" +msgstr "Seleccioneu un tipus de hook" #. Resource IDs: (IDS_SELECTBRANCH) msgid "Please select branch" @@ -7774,7 +7766,7 @@ msgstr "Port :" #. Resource IDs: (IDS_HOOKTYPE_POSTCOMMIT) msgid "Post-Commit Hook" -msgstr "Interconnexió Post-Entrega" +msgstr "Hook Post-Entrega" #. Resource IDs: (IDS_HOOKTYPE_POSTPUSH) msgid "Post-Push Hook" @@ -7786,7 +7778,7 @@ msgstr "Pàgina Prè&via" #. Resource IDs: (IDS_HOOKTYPE_PRECOMMIT) msgid "Pre-Commit Hook" -msgstr "Interconnexió Pre-Entrega" +msgstr "Hook Pre-Entrega" #. Resource IDs: (IDS_HOOKTYPE_PREPUSH) msgid "Pre-Push Hook" @@ -7794,7 +7786,7 @@ msgstr "Interconnexió Pre-empenta" #. Resource IDs: (IDS_HOOKTYPE_PREREBASE) msgid "Pre-rebase hook" -msgstr "Interconnexió Pre-rebase" +msgstr "Hook Pre-rebase" #. Resource IDs: (IDS_PROC_COMMIT_PREPARECOMMIT) msgid "Preparing commit..." @@ -7865,7 +7857,7 @@ msgstr "Imprimint" #. Resource IDs: (IDS_HOOK_FORCEDPROCEED) msgid "Proceed anyway" -msgstr "" +msgstr "Continua de totes maneres" #. Resource IDs: (IDS_PROGS_TOOLCOL) msgid "Program" @@ -7917,14 +7909,11 @@ msgid "Proxy Settings" msgstr "Configuració proxy" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "Poda" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "Poda (tots els remots)" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "Estira" @@ -8166,14 +8155,18 @@ msgid "Ref List" msgstr "Llista de ref" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" -msgstr "Cerca refs" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" +msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "RefLog" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "L'entrega de referències està activada" @@ -8250,7 +8243,8 @@ msgstr "Recorda la selecció (opció \"svn.rmdir\")" msgid "Reminder: Commit your change after resolve" msgstr "Recordatori: Entrega els canvis després de la resolució" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "Remot" @@ -8265,7 +8259,7 @@ msgstr "URL Remota" #. Resource IDs: (Dialog IDD_SUBMODULE_UPDATE: Control id 1754) msgid "Remote &tracking branch" -msgstr "Branca que segueix una branca remota" +msgstr "Branca ras&trejadora en remot" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 65535, #. IDS_PROC_REMOTEBRANCH) @@ -8568,7 +8562,7 @@ msgstr "Restitueix entrega %s" #. Resource IDs: (IDS_REVERTCOMMITS) msgid "Revert the selected commit(s)?" -msgstr "" +msgstr "Restituir l'entrega o les entregues seleccionades?" #. Resource IDs: (IDS_LOG_POPUP_REVERTTOPARENT) msgid "Revert to parent revision" @@ -8676,7 +8670,7 @@ msgstr "Imatge dreta" #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1848) msgid "Run for this repository" -msgstr "" +msgstr "Executa per aquest dipòsit" #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1335) msgid "Run when working tree path is under:" @@ -8773,8 +8767,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9058,7 +9052,7 @@ msgstr "Seleccioneu la carpeta a on voleu exportar.\nPotser vulgueu crear una ca #. Resource IDs: (IDS_SETTINGS_HOOKS_SELECTFOLDERPATH) msgid "Select folder to run script for" -msgstr "Selecciona carpeta a on córrer el script" +msgstr "Selecciona carpeta on executar l'script" #. Resource IDs: (IDS_LOG_SAVEFOLDERTOHINT) msgid "Select folder to save the selected files to" @@ -9066,7 +9060,7 @@ msgstr "Selecciona carpeta a on desar els fitxers seleccionats" #. Resource IDs: (IDS_SETTINGS_HOOKS_SELECTSCRIPTFILE) msgid "Select hook script file" -msgstr "Selecciona fitxer amb l'script d'interconnexió" +msgstr "Selecciona fitxer amb l'script hook" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1405) msgid "Select items automatically" @@ -9236,8 +9230,8 @@ msgid "Show" msgstr "Mostra" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" -msgstr "Mostra RefLog" +msgid "Show &RefLog" +msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, #. IDS_PROC_LOG_SHOWUNVERSIONED) @@ -9409,12 +9403,12 @@ msgid "Show la&beled commits only" msgstr "Mostra només les entregues etiquetades" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Mostra número&s de línea" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" -msgstr "" +msgstr "Mostra els fitxers bloquejats" #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 1132, Dialog #. IDD_DIFFFILES: Control id 1132, Dialog IDD_DIFFSUBMODULE: Control id 1132, @@ -9558,7 +9552,7 @@ msgstr "Mostra representació gràfica de còpies/etiquetes/branques" #. Resource IDs: (IDS_MENUDESCLFSLOCKS) msgid "Shows a list of all files locked using LFS" -msgstr "" +msgstr "Mostra una llista de tots els fitxers bloquejats amb LFS" #. Resource IDs: (IDS_MENUDESCSHOWCHANGED) msgid "Shows all files which were changed since the last commit." @@ -9701,7 +9695,7 @@ msgstr "Inicia la tria" #. Resource IDs: (IDS_HOOKTYPE_STARTCOMMIT) msgid "Start Commit Hook" -msgstr "Interconnexió d'inici Entrega" +msgstr "Hook d'inici Entrega" #. Resource IDs: (IDS_PROC_REBASE_STARTREBASE, IDS_PROC_STARTREBASEBUTTON) msgid "Start Rebase" @@ -10123,7 +10117,7 @@ msgid "" "The branch \"%s\" is a remote-tracking branch which locally represents a remote branch.\n" "\n" "Do you really want to delete it?" -msgstr "" +msgstr "La branca \"%s\" és una branca rastrejadora en remot que representa localment una branca remota.\n\nVoleu suprimir-la realment?" #. Resource IDs: (IDS_ERR_PATCH_CHUNKMISMATCH) msgid "The chunk size did not match the number of added/removed lines!" @@ -10230,6 +10224,10 @@ msgstr "Aquest fitxer és massa gran" msgid "The file is too large to open." msgstr "El fitxer és massa gran per obrir-lo." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10267,7 +10265,7 @@ msgstr "La carpeta \n%s\nno existeix.\nVoleu crear-la?" msgid "" "The hook script returned an error:\n" "%ls" -msgstr "" +msgstr "L'script hook ha retornat un error:\n%ls" #. Resource IDs: (IDS_ERR_HOOKFAILED) #, c-format @@ -10278,7 +10276,7 @@ msgstr "L'script d'interconnexió ha retornat un error:\n%s" #. Resource IDs: (IDS_ERR_HOOKNOTAPPROVED) msgid "The hook script was not approved to run!" -msgstr "" +msgstr "L'script hook no està aprovat per ser executat" #. Resource IDs: (IDS_INVALIDIMAGEINFO) msgid "The image can not be shown." @@ -10608,7 +10606,7 @@ msgid "" "This working copy has a client-side hook script configured. Do you want this script to run?\n" "The command line to run is:\n" "%ls" -msgstr "" +msgstr "Aquesta còpia de treball té un script hook configurat al cantó client. El voleu executar?\nLínia d'ordre a executar:\n%ls" #. Resource IDs: (IDS_TREE_DIFF) msgid "Three way diff" @@ -10733,12 +10731,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10859,7 +10857,7 @@ msgid "Trim right" msgstr "Retalla espais de la dreta" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11015,11 +11013,11 @@ msgstr "Tipus ref desconeguts" #. Resource IDs: (IDS_MENULFSUNLOCK, IDS_PROGRS_CMD_LFS_UNLOCK) msgid "Unlock" -msgstr "" +msgstr "Desbloqueja" #. Resource IDs: (IDS_MENUDESCLFSUNLOCK) msgid "Unlocks a file using LFS" -msgstr "" +msgstr "Desbloqueja un fitxer amb LFS" #. Resource IDs: (IDS_VIEWCONTEXTMENU_UNMARKBLOCK) msgid "Unmark this block" @@ -11108,8 +11106,8 @@ msgid "Use .mailmap" msgstr "Utilitza .mailmap" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" -msgstr "Utilitza Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" +msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) msgid "Use HTTP path component" @@ -11185,7 +11183,7 @@ msgstr "Utilitza el servidor configurat" #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 1513) msgid "Use dark mode" -msgstr "" +msgstr "Utilitza el mode fosc" #. Resource IDs: (ID_EDIT_USELEFTBLOCK - Menu, #. cmdUseLeftBlock_LabelTitle_RESID) @@ -11693,6 +11691,11 @@ msgstr "Ja heu provat la darrera versió instal·lada" msgid "You asked to pull, but did not specify a remote branch." msgstr "Heu demanat estirar, però sense especificar cap branca remota." +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_cs.po b/Languages/Tortoise_cs.po index 5c42dd986..46a8b35d9 100644 --- a/Languages/Tortoise_cs.po +++ b/Languages/Tortoise_cs.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Czech (http://www.transifex.com/lznuaa/tortoisegit/language/cs/)\n" "MIME-Version: 1.0\n" @@ -1848,6 +1848,10 @@ msgstr "Umožní vytvořit prázdné odevzdání obsahující pouze zprávu a ž msgid "Already up to date." msgstr "Již je aktuální." +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "Vždy odesílat do zvoleného vzdáleného archivu pro tuto místní větev" @@ -2115,10 +2119,6 @@ msgstr "Citlivost na velikost písmen u autorů" msgid "Auto CrLf convert" msgstr "Automatický převod CrLf" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2145,6 +2145,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "Automatické dokončování navrhuje, při psaní zprávy protokolu, slova\n(většinou názvy tříd či členů) ze souborů, které jste změnili." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "Automaticky načíst &klíč Putty" @@ -2919,6 +2923,18 @@ msgstr "Barvit podle věku, &průběžné" msgid "Colors" msgstr "Barvy" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3195,6 +3211,14 @@ msgstr "Konflikty" msgid "Conflicts: %d" msgstr "Konfliktů: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "Kontextové řádky pro záplaty" @@ -3317,9 +3341,9 @@ msgstr "Nelze najít super projekt" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3550,6 +3574,10 @@ msgstr "Vytvoří soubor sjednoceného rozdílu se všemi provedenými změnami" msgid "Creating pull-request..." msgstr "Vytvořit žádost o stažení" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "Pomocník s pověřením nesmí být prázdný." @@ -3868,6 +3896,18 @@ msgstr "Velikosti a pozice dialogových oken" msgid "Dialogs" msgstr "Dialogová okna" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Porovnat" @@ -3884,10 +3924,6 @@ msgstr "Porovnat dvě odevzdání" msgid "Diff Viewer" msgstr "Prohlížeč rozdílů" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Prohlížeč rozdílů::Nástroj sloučení" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Porovnat přidané soubory" @@ -4377,7 +4413,7 @@ msgstr "Účinné" msgid "Either the name or IP of the proxy server" msgstr "Buď název nebo IP proxy serveru" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "Email" @@ -5151,16 +5187,16 @@ msgstr "Dopředu %d" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." -msgstr "Nalezen příznak, že již probíhá TortoiseGit rebase, proto operace nemůže pokračovat.\nPokud jste teď nespouštěli TortoiseGit rebase, můžete odstranit soubor s příznakem, abyste mohli pokračovat." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) msgid "" @@ -5263,42 +5299,6 @@ msgstr "Shromažďování statistik" msgid "General" msgstr "Obecné" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "Obecné::Alternativní editor" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "Obecné::Barvy 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "Obecné::Barvy 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "Obecné::Barvy 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Obecné::Kontextová nabídka" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "Obecné::Context Menu 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Obecné::Dialogová okna 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Obecné::Dialogová okna 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Obecné::Dialogová okna 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Získat protokoly sloučení" @@ -5427,14 +5427,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "Git se řídí pojmem hierarchického nastavení:\nExistuje mnoho úrovní; nastavení ve vyšších úrovních potlačují hodnotu v nižších.\nKarta \"Účinné\" ukazuje účinné hodnoty pro současnou úroveň (pouze pro čtení).\nVyberte jakoukoli úroveň pro zobrazení jejích uložených hodnot.\nPro změnu nastavení vyberte úroveň, zadejte hodnoty a vyberte kam je uložit." -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "Git::Pověření" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "Git::Vzdálené" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5612,14 +5604,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Hákové skripty" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "Hákové skripty::Nastavení systému pro sledování chyb" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Hákové skripty::Systém sledování chyb" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Typ háku" @@ -5891,12 +5875,8 @@ msgid "Icon Overlays" msgstr "Překryvy ikon" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Překryvy ikon::Sada ikon" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Překryvy ikon::Obslužné rutiny překrytí" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6126,8 +6106,8 @@ msgid "Importing file %s" msgstr "Importování souboru %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" -msgstr "Seznam změn" +msgid "In Changelist" +msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) msgid "In Commits" @@ -6199,7 +6179,7 @@ msgstr "Vložit obsah schránky\nVložit" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6224,6 +6204,14 @@ msgstr "Neplatná měna." msgid "Invalid revision number!" msgstr "Neplatné číslo revize!" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "Vydavatel:" @@ -6704,6 +6692,10 @@ msgstr "Bod sloučení" msgid "Merge Reintegrate" msgstr "Znovuzačlenění sloučení" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6875,10 +6867,6 @@ msgstr "Vnořené" msgid "Network" msgstr "Síť" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "Síť::Email" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Nové" @@ -7155,7 +7143,7 @@ msgstr "Uvědomte si, že pokud vyberete obnovu automaticky uložených dokument #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7472,8 +7460,8 @@ msgid "Others" msgstr "Další" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" -msgstr "Seznam odchozích změn" +msgid "Out Changelist" +msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) msgid "Out Commits" @@ -7491,6 +7479,10 @@ msgstr "Výstupní adresář" msgid "Output.prn" msgstr "Výstup.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "Přepsat" @@ -7915,14 +7907,11 @@ msgid "Proxy Settings" msgstr "Nastavení proxy" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "Ořezat" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "Ořezat (Všechny vzdálené)" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "Odeslat" @@ -8164,14 +8153,18 @@ msgid "Ref List" msgstr "Seznam revizí" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" -msgstr "Prohlížení odkazů" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" +msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "Protokol odkazů" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "Zobrazení odkazů, ve kterých je odevzdání obsaženo" @@ -8248,7 +8241,8 @@ msgstr "Zapamatovat si výběr (volba \"svn.rmdir\")" msgid "Reminder: Commit your change after resolve" msgstr "Nezapomeňte: Po vyřešení své změny odevzdejte" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "Vzdálený" @@ -8771,8 +8765,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9234,8 +9228,8 @@ msgid "Show" msgstr "Zobrazit" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" -msgstr "&Zobrazit protokol odkazů" +msgid "Show &RefLog" +msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, #. IDS_PROC_LOG_SHOWUNVERSIONED) @@ -9407,8 +9401,8 @@ msgid "Show la&beled commits only" msgstr "&Zobrazit pouze označené komentáře" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "&Zobrazit čísla řádků" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10228,6 +10222,10 @@ msgstr "Soubor je příliš velký" msgid "The file is too large to open." msgstr "Soubor je příliš velký na otevření." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10731,12 +10729,12 @@ msgstr "TortoiseGitBlame, Verze %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10857,7 +10855,7 @@ msgid "Trim right" msgstr "Oříznout vpravo" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11106,7 +11104,7 @@ msgid "Use .mailmap" msgstr "Použít .mailmap" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11691,6 +11689,11 @@ msgstr "Již máte nainstalovánu nejnovější verzi." msgid "You asked to pull, but did not specify a remote branch." msgstr "Zažádali jste o stáhnutí, ale nezadali jste vzdálenou větev." +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_da.po b/Languages/Tortoise_da.po index 69c0e6358..287caf5fa 100644 --- a/Languages/Tortoise_da.po +++ b/Languages/Tortoise_da.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -16,7 +16,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Danish (http://www.transifex.com/lznuaa/tortoisegit/language/da/)\n" "MIME-Version: 1.0\n" @@ -1846,6 +1846,10 @@ msgstr "" msgid "Already up to date." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "" @@ -2113,10 +2117,6 @@ msgstr "Forfattere er følsom overfor store/små bogstaver." msgid "Auto CrLf convert" msgstr "" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2143,6 +2143,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "" +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "" @@ -2917,6 +2921,18 @@ msgstr "Farvelæg efter alder, &fortløbende" msgid "Colors" msgstr "Farver" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3193,6 +3209,14 @@ msgstr "" msgid "Conflicts: %d" msgstr "Konflikter: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "" @@ -3315,9 +3339,9 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3548,6 +3572,10 @@ msgstr "Opretter en unified diff-fil med alle ændringer, du har foretaget" msgid "Creating pull-request..." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "" @@ -3866,6 +3894,18 @@ msgstr "Dialogstørrelser og -placeringer" msgid "Dialogs" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Sammenlign" @@ -3882,10 +3922,6 @@ msgstr "" msgid "Diff Viewer" msgstr "Forskelsviser" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Forskelsviser::Fletteværktøj" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Forskel tilføjet linjer" @@ -4375,7 +4411,7 @@ msgstr "" msgid "Either the name or IP of the proxy server" msgstr "Navn eller IP-adresse på proxyserveren" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "" @@ -5149,15 +5185,15 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5261,42 +5297,6 @@ msgstr "" msgid "General" msgstr "Generelt" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Generelt::Kontekstmenu" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Generelt::Dialoger 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Generelt::Dialoger 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Generelt::Dialoger 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Hent fletningslogge" @@ -5425,14 +5425,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5610,14 +5602,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Tilkoblinger" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Tilkoblinger::Integration af sagsbehandler" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Tilkoblingstype" @@ -5889,12 +5873,8 @@ msgid "Icon Overlays" msgstr "Ikonoverdækning" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Ikonoverdækning::Ikonsæt" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Ikonoverdækning::Overdækningshåndteringer" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6124,7 +6104,7 @@ msgid "Importing file %s" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6197,7 +6177,7 @@ msgstr "Indsæt indholdet af udklipsholderen\nIndsæt" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6222,6 +6202,14 @@ msgstr "Ugyldig Valuta." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6702,6 +6690,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "Reintegreringsfletning" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6873,10 +6865,6 @@ msgstr "Indlejret" msgid "Network" msgstr "Netværk" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Ny" @@ -7153,7 +7141,7 @@ msgstr "Bemærk at hvis du vælger at genskabe de automatisk gemte dokumenter sk #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7470,7 +7458,7 @@ msgid "Others" msgstr "Andre" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7489,6 +7477,10 @@ msgstr "" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "" @@ -7913,14 +7905,11 @@ msgid "Proxy Settings" msgstr "Proxy-indstillinger" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "" @@ -8162,14 +8151,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8246,7 +8239,8 @@ msgstr "" msgid "Reminder: Commit your change after resolve" msgstr "" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "" @@ -8769,8 +8763,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9232,7 +9226,7 @@ msgid "Show" msgstr "Vis" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9405,8 +9399,8 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Vis lin&jenumre" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10226,6 +10220,10 @@ msgstr "Filen er for stor" msgid "The file is too large to open." msgstr "Filen er for stor til at blive åbnet." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10729,12 +10727,12 @@ msgstr "" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10855,7 +10853,7 @@ msgid "Trim right" msgstr "TIlpas til højre" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11104,7 +11102,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11689,6 +11687,11 @@ msgstr "Du har allerede den nyeste version installeret." msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_de.po b/Languages/Tortoise_de.po index 67fd719dd..6b6dc2c7d 100644 --- a/Languages/Tortoise_de.po +++ b/Languages/Tortoise_de.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -18,7 +18,7 @@ # Obareo, 2019 # peu , 2013 # Stefan Kueng , 2014 -# Sven Strickroth , 2012-2020 +# Sven Strickroth , 2012-2021 # Thilo Berger , 2017 # Torsten Widmann , 2012 msgid "" @@ -26,7 +26,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: 2020-10-07 09:39+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: German (http://www.transifex.com/lznuaa/tortoisegit/language/de/)\n" "MIME-Version: 1.0\n" @@ -1856,6 +1856,10 @@ msgstr "Erlaubt das Erstellen einer leeren Eintragung, die nur aus eine Eintragu msgid "Already up to date." msgstr "Bereits auf dem neusten Stand." +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "Alternativer Editor" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "Versende immer zum ausgewählten Projektarchiv für diesen lokalen Zweig" @@ -2123,10 +2127,6 @@ msgstr "Groß-/Kleinschreibung bei Autoren beachten" msgid "Auto CrLf convert" msgstr "Auto CrLf Konvertierung" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "Auto&CrLf:" @@ -2153,6 +2153,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "Automatisch Vervollständigen schlägt bei der Eingabe der\nLogmeldung Wörter (üblicherweise Klassen- oder Variablennamen)\naus den geänderten Dateien vor." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "AutoCrLf:" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "Putty-&Key automatisch laden" @@ -2927,6 +2931,18 @@ msgstr "Nach Alter einfärben, &kontinuierlich" msgid "Colors" msgstr "Farben" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "Farben 1" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "Farben 2" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "Farben 3" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3203,6 +3219,14 @@ msgstr "Konflikte" msgid "Conflicts: %d" msgstr "Konflikte: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "Kontextmenü" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "Kontextmenü 2" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "Kontext-Zeilen für Patches" @@ -3325,10 +3349,10 @@ msgstr "Konnte übergeordnetes Projekt nicht finden" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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 "\"msysgit\" oder \"windows\" konnten nicht in der Versionsausgabe von git.exe gefunden werden.\nSollten Sie git aus der Cygwin- oder Msys2-Umgebung nutzen, sind spezielle Hacks notwendig.\nFür mehr Informationen konsultieren Sie bitte die Hilfe unter dem Stichwort \"cygwin git\" or \"msys2 git\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "\"msysgit\" oder \"windows\" konnten nicht in der Versionsausgabe von git.exe gefunden werden.\nSollten Sie git aus der Cygwin- oder MSYS2-Umgebung nutzen, sind spezielle Hacks notwendig.\nFür mehr Informationen konsultieren Sie bitte die Hilfe unter dem Stichwort \"Cygwin Git\" or \"MSYS2 Git\"." #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) #, c-format @@ -3558,6 +3582,10 @@ msgstr "Erzeugt eine Standard-Diffdatei mit all Ihren Änderungen" msgid "Creating pull-request..." msgstr "Erstelle Anforderungdsanfrage..." +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "Anmeldeinformationen" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "Der \"Credential helper\" darf nicht leer sein." @@ -3876,6 +3904,18 @@ msgstr "Dialoggrößen und -positionen" msgid "Dialogs" msgstr "Dialoge" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "Dialoge 1" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "Dialoge 2" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "Dialoge 3" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Vergleich" @@ -3892,10 +3932,6 @@ msgstr "Zwei Eintragungen vergleichen" msgid "Diff Viewer" msgstr "Vergleichsprogramm" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Vergleichsprogramm::Zusammenführen" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Diff hinzugefügte Zeilen" @@ -4385,7 +4421,7 @@ msgstr "Effektiv" msgid "Either the name or IP of the proxy server" msgstr "Entweder der Name oder die IP Adresse des Proxy Servers" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "E-Mail" @@ -5159,15 +5195,15 @@ msgstr "Forward %d" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." -msgstr "\"msysgit\" oder \"windows\" wurden in der Versionsausgabe von git.exe gefunden, obwohl Sie git.exe Hacks aktiviert haben. Diese Hacks müssen bei der Nutzung von Git für Windows deaktiviert werden!\nFür mehr Informationen konsultieren Sie bitte die Hilfe unter dem Stichwort \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." +msgstr "\"msysgit\" oder \"windows\" wurden in der Versionsausgabe von git.exe gefunden, obwohl Sie git.exe Hacks aktiviert haben. Diese Hacks müssen bei der Nutzung von Git für Windows deaktiviert werden!\nFür mehr Informationen konsultieren Sie bitte die Hilfe unter dem Stichwort \"Cygwin Git\" or \"MSYS2 Git\"." #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "Es wurde eine Sperrdatei gefunden, die einen laufenden TortoiseGit Rebase-Prozess kennzeichnet. Dies blockiert die aktuelle Operation.\n\nWenn Sie genau jetzt keinen TortoiseGit Rebase-Prozess durchführen, können Sie die veraltete Sperrdatei löschen um forzufahren." #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5271,42 +5307,6 @@ msgstr "Berechne Statistiken" msgid "General" msgstr "Allgemein" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "Allgemein::Alternativer Editor" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "Allgemein::Farben 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "Allgemein::Farben 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "Allgemein::Farben 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Allgemein::Kontextmenü" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "Allgemein::Kontextmenü 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Allgemein::Dialoge 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Allgemein::Dialoge 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Allgemein::Dialoge 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Logs vom Zusammenführen holen" @@ -5435,14 +5435,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "Git benutzt das Konzept einer hierarchischen Konfiguration.\nD.h. es gibt mehrere Level; Einstellungen in höhreren Leveln überschreiben Einstellungen niedrigerer Level.\nDer \"Effektiv\"-Tab zeigt die effektiven Werte für den aktuellen Anwendungsbereich (nur lesend).\nWählen Sie ein Level, um die Werte, die dort gespeichert sind, einzusehen.\nUm Einstellungen zu ändern, wählen Sein ein level aus, geben die Werte und entscheiden in welches Level die Werte gespeichert werden sollen." -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "Git::Credential" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "Git::Archive" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5620,14 +5612,6 @@ msgstr "Hinweis: Sie können auf kürzlich verwendete Meldungen über das Kontex msgid "Hook Scripts" msgstr "Aktionsskripte" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "Aktionsskripte::Integration des Fehlerverfolgungssystems" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Aktionsskripte::Integration des Fehlerverfolgungssystems" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Aktionstyp" @@ -5899,12 +5883,8 @@ msgid "Icon Overlays" msgstr "Überlagerte Symbole" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Überlagerte Symbole::Auswahl" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Überlagerte Symbole::Aktivieren" +msgid "Icon Set" +msgstr "Auswahl" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6134,7 +6114,7 @@ msgid "Importing file %s" msgstr "Importiere Datei %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "Eingehende Änderungsliste" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6207,7 +6187,7 @@ msgstr "Inhalt der Zwischenablage einfügen\nEinfügen" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "Benutze einen bestimmten Zweig anstatt den neu erstellten HEAD auf den Zweig zu zeigen, auf den der HEAD des geklonten Repositorys zeigt" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6232,6 +6212,14 @@ msgstr "Ungültige Währung" msgid "Invalid revision number!" msgstr "Ungültige Revisionsangabe." +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "Integration des Fehlerverfolgungssystems" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "Integration des Fehlerverfolgungssystems" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "Aussteller:" @@ -6712,6 +6700,10 @@ msgstr "Zusammenführungspunkt" msgid "Merge Reintegrate" msgstr "Wieder Eingliedern" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "Zusammenführen" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6883,10 +6875,6 @@ msgstr "Verschachtelt" msgid "Network" msgstr "Netzwerk" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "Netzwerk::E-Mail" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Neu" @@ -7163,7 +7151,7 @@ msgstr "Wenn Sie die automatisch gespeicherten Dokumente wieder herstellen, müs #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "Beachten Sie: Diese Einstellungen wirken sich ebenfalls auf den Diffdateien-Viewer aus.\nUm zu wählen, ob Sie das eingebauten Diffdatei-Anzeigeprogramm oder eine alternative nutzen möchten, gehen Sie bei den Einstellungen links zu \"Vergleichsprogramm\"." #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7480,7 +7468,7 @@ msgid "Others" msgstr "Andere" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "Ausgehende Änderungsliste" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7499,6 +7487,10 @@ msgstr "Ausgabe Verzeichnis:" msgid "Output.prn" msgstr "Ausgabe.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "Überlagerte Symbole" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "Überschreiben" @@ -7923,14 +7915,11 @@ msgid "Proxy Settings" msgstr "Proxy Einstellungen" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "Zweige aufräumen" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "Zweige aufräumen (alle entfernten Repositories)" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "Anfordern" @@ -8172,14 +8161,18 @@ msgid "Ref List" msgstr "Ref Liste" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "Referenzen durchsuchen" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "RefLog" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "Referenzen durchsuchen" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "Zeige Referenzen auf denen diese Revision liegt" @@ -8256,7 +8249,8 @@ msgstr "Auswahl merken (\"svn.rmdir\" Option)" msgid "Reminder: Commit your change after resolve" msgstr "Erinnerung: Tragen Sie Ihre Änderungen nach der Konfliktlösung ein" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "Archiv" @@ -8779,8 +8773,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "SafeCrLf:" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9242,7 +9236,7 @@ msgid "Show" msgstr "Anzeigen" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "Zeige &Reflog" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9415,7 +9409,7 @@ msgid "Show la&beled commits only" msgstr "Zeige nur Eintragungen mit Zweigen/Markierungen" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" +msgid "Show line number&s" msgstr "Zeige Zeilen&nummern" #. Resource IDs: (IDS_MENULFSLOCKS) @@ -10236,6 +10230,10 @@ msgstr "Die Datei ist zu groß" msgid "The file is too large to open." msgstr "Die Datei ist zu groß, um sie zu öffnen." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "Die Datei wurde modifiziert. Möchten Sie die Änderungen speichern?" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10739,12 +10737,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "TortoiseGitBlame\n\nTortoiseGitBlame\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10865,7 +10863,7 @@ msgid "Trim right" msgstr "rechts abschneiden/bereinigen" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "Vertraue dem Exit-Code des externen Vergleichprogramms zur automatischen Konfliktlösung" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11114,8 +11112,8 @@ msgid "Use .mailmap" msgstr "Benutze .mailmap" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" -msgstr "Benutze Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" +msgstr "Benutze Git LFS (nur benötigt für Git < 2,15 und Git LFS < 2.3)" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) msgid "Use HTTP path component" @@ -11699,6 +11697,11 @@ msgstr "Sie haben bereits die neueste Version installiert." msgid "You asked to pull, but did not specify a remote branch." msgstr "Sie möchten Eintragungen angeforn, haben aber keinen entfernten Zweig ausgewählt." +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "Sie können diese Einstellung für alle Remotes bzw. global auf der Git Einstellungsseite konfigurieren." + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_el.po b/Languages/Tortoise_el.po index b1c2b01df..c9a921318 100644 --- a/Languages/Tortoise_el.po +++ b/Languages/Tortoise_el.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -14,7 +14,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Greek (http://www.transifex.com/lznuaa/tortoisegit/language/el/)\n" "MIME-Version: 1.0\n" @@ -1844,6 +1844,10 @@ msgstr "Επέτρεψε να γίνετε μια άδεια προσθήκη π msgid "Already up to date." msgstr "Είναι ήδη ενημερωμένο." +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "Πάντα σπρώξε στην επιλεγμένη απομακρυσμένη συλλογή αρχείον για αυτόν τον τοπικό κλάδο." @@ -2111,10 +2115,6 @@ msgstr "Συγγραφείς (γραφή ευαίσθητη σε πεζά/κεφ msgid "Auto CrLf convert" msgstr "Αυτόματη μετατροπή CrLf " -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2141,6 +2141,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "Η αυτόματη ολοκλήρωση προτείνει λέξης (συνήθως από κλάσεις η ονόματα μελών)\nαπό τα αρχεία που έχετε αλλάξει καθώς γράφετε το μήνυμα καταγραφής." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "Αυτόματη Φόρτιση &κλειδιού Putty" @@ -2915,6 +2919,18 @@ msgstr "Χρώμα κατά ηλικία, &συνεχής" msgid "Colors" msgstr "Χρώματα" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3191,6 +3207,14 @@ msgstr "Συγκρούσεις " msgid "Conflicts: %d" msgstr "Διιστάσεις: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "Γραμμές πλαισίου για patches" @@ -3313,10 +3337,10 @@ msgstr "Δεν μπόρεσε να βρεθεί υπερέργο" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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 "Δεν βρέθηκε \"msysgit\" η \"windows\" στην συμβολοσειρά έκδοσης του git.exe.\nΑν χρησιμοποιείτε το git με περιβάλλον cygwin η msys2 πρέπει να ενεργοποιήσετε ειδικά hacks.\nΓια περισσότερες πληροφορίες ψάξτε στην βοήθεια την λέξη-κλειδί \"cygwin git\" η \"msys2 git\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) #, c-format @@ -3546,6 +3570,10 @@ msgstr "Δημιουργία ενός ενοιαίου αρχείου διαφο msgid "Creating pull-request..." msgstr "Δημιουργία αιτήματος Pull..." +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "Ο βοηθός πιστοποιητικών πρέπει να είναι κενός. " @@ -3864,6 +3892,18 @@ msgstr "Θέσεις και μεγέθη διαλόγων" msgid "Dialogs" msgstr "Διάλογοι" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Διαφορά" @@ -3880,10 +3920,6 @@ msgstr "Διαφορές ανάμεσα σε δυο Commits" msgid "Diff Viewer" msgstr "Θεατής Διαφορων" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Θεατής Διαφορων::Εργαλείο Συγχώνευσης" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Diff πρόσθεσε γραμμές" @@ -4373,7 +4409,7 @@ msgstr "Αποτελεσματικός" msgid "Either the name or IP of the proxy server" msgstr "Ή το όνομα ή την ΙΡ του πληρεξούσιου διακομηστή" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "Ηλεκτρονική διεύθυνση" @@ -5147,16 +5183,16 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." -msgstr "Βρέθηκε μια κλειδαριά που υποδεικνύει πως μια διαδικασία TortoiseGit επαναφορά κλάδου τρέχει. Αυτό μπλοκάρει αυτήν την λειτουργιά\n\nΑν δεν τρέχετε μια διαδικασία TortoiseGit επαναφοράς κλάδου, τότε αφαιρέστε την κλειδαριά για να μπορέσετε να συνεχίσετε." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) msgid "" @@ -5259,42 +5295,6 @@ msgstr "" msgid "General" msgstr "Γενικά" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Γενικά::Μενού Πλαίσιο" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "Γενικά::Μενού Πλαίσιο 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Γενικά::Διαλόγων 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Γενικά::Διαλόγων 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Γενικά::Διαλόγων 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "" @@ -5423,14 +5423,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5608,14 +5600,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Γάντζωμα αρχείων" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Γάντζωμα αρχείων::Ενσωμάτοση ανίχνευσης σφαλμάτων " - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Είδος γάντζου" @@ -5887,11 +5871,7 @@ msgid "Icon Overlays" msgstr "Επικαλύψεις εικονιδίων" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Επικαλύψεις εικονιδίων::Σύνολο εικονιδίων" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" +msgid "Icon Set" msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) @@ -6122,7 +6102,7 @@ msgid "Importing file %s" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6195,7 +6175,7 @@ msgstr "Εισάγετε τα περιεχόμενα του πίνακα\nΕπι #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6220,6 +6200,14 @@ msgstr "Μη έγκυρο νόμισμα." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6700,6 +6688,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "Επανένταξη συγχώνευσης" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6871,10 +6863,6 @@ msgstr "Ένθετα" msgid "Network" msgstr "Δικτιο" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Νέο" @@ -7151,7 +7139,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7468,7 +7456,7 @@ msgid "Others" msgstr "Άλλοι" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7487,6 +7475,10 @@ msgstr "" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "" @@ -7911,14 +7903,11 @@ msgid "Proxy Settings" msgstr "Ρυθμίσεις Proxy" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "" @@ -8160,14 +8149,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8244,7 +8237,8 @@ msgstr "" msgid "Reminder: Commit your change after resolve" msgstr "" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "" @@ -8767,8 +8761,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9230,7 +9224,7 @@ msgid "Show" msgstr "Επίδειξη" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9403,8 +9397,8 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Επίδειξη &αριθμών γραμμών" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10224,6 +10218,10 @@ msgstr "Το αρχείο είναι πολύ μεγάλο" msgid "The file is too large to open." msgstr "Το αρχείο είναι πολύ μεγάλο για να ανοιχτεί." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10727,12 +10725,12 @@ msgstr "TortoiseGitBlame, Έκδοση%d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10853,7 +10851,7 @@ msgid "Trim right" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11102,7 +11100,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11687,6 +11685,11 @@ msgstr "Έχετε ήδη εγκατεστημένη την τελευταία msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_es.po b/Languages/Tortoise_es.po index 7bf30636a..0a787077e 100644 --- a/Languages/Tortoise_es.po +++ b/Languages/Tortoise_es.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -34,7 +34,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Spanish (http://www.transifex.com/lznuaa/tortoisegit/language/es/)\n" "MIME-Version: 1.0\n" @@ -1864,6 +1864,10 @@ msgstr "Permite crear una consignación (commit) vacía que sólo tenga un mensa msgid "Already up to date." msgstr "Ya está actualizado." +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "Impulsar (push) siempre hacia el archivo remoto seleccionado para este ramal local" @@ -2131,10 +2135,6 @@ msgstr "Alfabéticamente A_a-Z_z " msgid "Auto CrLf convert" msgstr "Auto convertir CrLf" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2161,6 +2161,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "Auto-completar palabra sugerida (generalmente clases, nombres de miembros)\ndesde los archivos que has cambiado cuando escribes un mensaje de registro." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "Auto-cargar &clave Putty" @@ -2935,6 +2939,18 @@ msgstr "Color antiguedad &continuo" msgid "Colors" msgstr "Colores" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3211,6 +3227,14 @@ msgstr "Conflictos" msgid "Conflicts: %d" msgstr "Conflictos: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "Líneas de contexto para parches" @@ -3333,10 +3357,10 @@ msgstr "No se puedo encontrar Super-project" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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 "No se pudo encontrar \"msysgit\" o \"windows\" en versionstring (cadena de versión) de git.exe.\nSi está usando el git del entorno cygwin o msys2, tiene que habilitar trucos especiales.\nPara más información vea el fichero de ayuda para las palabras clave \"cygwin git\" o \"msys2 git\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) #, c-format @@ -3566,6 +3590,10 @@ msgstr "Crea un archivo de dif. unificado con todos los cambios hechos" msgid "Creating pull-request..." msgstr "Creando petición de incorporación (pull)..." +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "El ayudante de credenciales no debe estar vacío." @@ -3884,6 +3912,18 @@ msgstr "Tamaños y posiciones de diálogos" msgid "Dialogs" msgstr "Cuadros de diálogo" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Diff" @@ -3900,10 +3940,6 @@ msgstr "Dif. dos Consignas" msgid "Diff Viewer" msgstr "Visor Dif." -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Visor Diff::Herramienta de combinación (merge)" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Diff líneaas añadidas" @@ -4393,7 +4429,7 @@ msgstr "Efectivo" msgid "Either the name or IP of the proxy server" msgstr "Cualesquiera nombre o la dirección IP del servidor proxy" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "Correo" @@ -5167,16 +5203,16 @@ msgstr "Reenviar %d" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." -msgstr "Se encontró \"msysgit\" o \"windows\" en versionstring (cadena de versión) de git.exe, sin embargo, tiene los trucos de git.exe habilitados. ¡Estos trucos se deben deshabilitar para una operatividad adecuada con Git para Windows!\nPuede encontrar más información en el fichero de ayuda para la palabras clave \"cygwin git\" o \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." +msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." -msgstr "Se encontró un fichero de bloqueo (lock) indicando que un proceso de reasentado (rebase) de TortoiseGit está en ejecución. Esto bloquea esta operación. \n\nSi no está ejecutando un proceso de reasentado (rebase) de TortoiseGit ahora mismo, puede eliminar el fichero de bloqueo (lock) erróneo para continuar." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) msgid "" @@ -5279,42 +5315,6 @@ msgstr "Reuniendo estadísticas" msgid "General" msgstr "General" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "General::Editor alternativo" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "General::Colores 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "General::Colores 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "General::Colores 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "General::Menú contextual" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "General::Diálogos 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "General::Diálogos 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "General::Diálogos 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Obtener logs de combinación" @@ -5443,14 +5443,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "Git usa el concepto de configuración jerárquica.\nEs decir, hay múltiples niveles; las configuraciones en los niveles superiores se imponen a los valores en los niveles inferiores.\nLa pestaña \"Efectivo\" le muestra los valores efectivos para el ámbito actual (sólo-lectura).\nSeleccione cualquier nivel para ver los valores almacenados allí.\nPara cambiar las configuraciones seleccione un nivel, introduzca los valores y seleccione dónde almacenarlo." -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "Git::Credencial" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "Git::Remoto" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5628,14 +5620,6 @@ msgstr "Consejo: Los mensajes de consignación (commit) están disponibles usand msgid "Hook Scripts" msgstr "Scripts de enganches" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "Scripts de enganches::Configuración del rastreador de problemas" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Scripts de enganches::Integración del rastreador de problemas" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Tipo de enganche" @@ -5907,12 +5891,8 @@ msgid "Icon Overlays" msgstr "Iconos Superpuestos" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Iconos Superpuestos::Juego de iconos" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Iconos Superpuestos::Controladores de Superpuestos" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6142,8 +6122,8 @@ msgid "Importing file %s" msgstr "Importando archivo %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" -msgstr "En Lista de cambios" +msgid "In Changelist" +msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) msgid "In Commits" @@ -6215,7 +6195,7 @@ msgstr "Insertar contenido del portapapeles\nPegar" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6240,6 +6220,14 @@ msgstr "Divisa no válida," msgid "Invalid revision number!" msgstr "¡Número de revisión no válido!" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "Publicante:" @@ -6720,6 +6708,10 @@ msgstr "Punto de combinación (merge)" msgid "Merge Reintegrate" msgstr "Reintegración de combinación (merge)" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6891,10 +6883,6 @@ msgstr "Anidado" msgid "Network" msgstr "Redes" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "Redes::Correo" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Nuevo" @@ -7171,7 +7159,7 @@ msgstr "Ten en cuenta que si opta por recuperar los documentos auto-salvados, im #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7488,8 +7476,8 @@ msgid "Others" msgstr "Otros" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" -msgstr "Fuera de lista de cambios" +msgid "Out Changelist" +msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) msgid "Out Commits" @@ -7507,6 +7495,10 @@ msgstr "Directorio de Salida" msgid "Output.prn" msgstr "Salida.impr" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "Sobreescribir" @@ -7931,14 +7923,11 @@ msgid "Proxy Settings" msgstr "Ajustes del Proxy" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "Podar (prune)" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "Podar ([prune] todos los remotos)" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "Incorporar (pull)" @@ -8180,14 +8169,18 @@ msgid "Ref List" msgstr "Lista de referencias (ref)" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" -msgstr "Buscar Ref." +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" +msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "Reg.Ref." +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "La consignación (commit) de referencias está activada" @@ -8264,7 +8257,8 @@ msgstr "Recordar selección (opción \"svn.rmdir\")" msgid "Reminder: Commit your change after resolve" msgstr "Recuerda: Consigna tus cambios trás resolver" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "Remoto" @@ -8787,8 +8781,8 @@ msgid "Sa&feCrLf:" msgstr "Se&guroCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Seguro CrLf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9250,8 +9244,8 @@ msgid "Show" msgstr "Mostrar" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" -msgstr "Mostrar ®istro de referencias (ref)" +msgid "Show &RefLog" +msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, #. IDS_PROC_LOG_SHOWUNVERSIONED) @@ -9423,8 +9417,8 @@ msgid "Show la&beled commits only" msgstr "Mostrar sólo consignaciolnes (commits) e&tiquetados" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Mostrar número&s de línea" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10244,6 +10238,10 @@ msgstr "El archivo es muy grande" msgid "The file is too large to open." msgstr "El archivo es muy grande para abrirlo." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10747,12 +10745,12 @@ msgstr "TortoiseGitBlame, Versión %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Documentación\nTortoiseGitBlame.Documentación" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10873,7 +10871,7 @@ msgid "Trim right" msgstr "Recortar a la derecha" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11122,8 +11120,8 @@ msgid "Use .mailmap" msgstr "Usar .mailmap" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" -msgstr "Usar Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" +msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) msgid "Use HTTP path component" @@ -11707,6 +11705,11 @@ msgstr "Ya tienes la última versión instalada." msgid "You asked to pull, but did not specify a remote branch." msgstr "Ha pedido incorporar (pull), pero no especificó un ramal remoto." +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_fa.po b/Languages/Tortoise_fa.po index 4677676ac..e17d4a7d3 100644 --- a/Languages/Tortoise_fa.po +++ b/Languages/Tortoise_fa.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -17,7 +17,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Persian (http://www.transifex.com/lznuaa/tortoisegit/language/fa/)\n" "MIME-Version: 1.0\n" @@ -1847,6 +1847,10 @@ msgstr "" msgid "Already up to date." msgstr "در حال حاضر بهنگام است" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "" @@ -2114,10 +2118,6 @@ msgstr "مؤلفین بدون حساسیت به case" msgid "Auto CrLf convert" msgstr "" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2144,6 +2144,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "" +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "" @@ -2918,6 +2922,18 @@ msgstr "" msgid "Colors" msgstr "رنگ‌ها" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3194,6 +3210,14 @@ msgstr "" msgid "Conflicts: %d" msgstr "تضادها: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "" @@ -3316,9 +3340,9 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3549,6 +3573,10 @@ msgstr "یک فایل مقایسه ای متحد با همه تغییراتتا msgid "Creating pull-request..." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "" @@ -3867,6 +3895,18 @@ msgstr "اندازه و مکان پنجره های محاوره ای" msgid "Dialogs" msgstr "محاوره‌ای ها" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "تفاوت" @@ -3883,10 +3923,6 @@ msgstr "" msgid "Diff Viewer" msgstr "نمایش‌دهندهٔ تفاوت" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "نمایش‌دهندهٔ تفاوت::ابزار ادغام" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "" @@ -4376,7 +4412,7 @@ msgstr "" msgid "Either the name or IP of the proxy server" msgstr "نام یا IP پراکسی سرور" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "پست الکترونیک" @@ -5150,15 +5186,15 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5262,42 +5298,6 @@ msgstr "" msgid "General" msgstr "عمومی" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "عمومی::منوی راست کلیک" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "عمومی::دیالوگ 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "عمومی::دیالوگ 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "General::Dialogs 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "دریافت پیامهای ادغام" @@ -5426,14 +5426,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5611,14 +5603,6 @@ msgstr "" msgid "Hook Scripts" msgstr "اسکریپت های قلاب" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Hook Scripts::Issue Tracker Integration" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "نوع قلاب" @@ -5890,12 +5874,8 @@ msgid "Icon Overlays" msgstr "پوشش آیکونها" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "پوشش آیکونها::مجموعه آیکون" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Icon Overlays::Overlay Handlers" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6125,7 +6105,7 @@ msgid "Importing file %s" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6198,7 +6178,7 @@ msgstr "واردکردن محتوای کلیپ بورد\nچسباندن" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6223,6 +6203,14 @@ msgstr "واحد پولی نامعتبر." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6703,6 +6691,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "ادغام مجدد" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6874,10 +6866,6 @@ msgstr "تودرتو" msgid "Network" msgstr "شیکه" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "جدید" @@ -7154,7 +7142,7 @@ msgstr "Note that if you choose to recover the auto-saved documents, you must ex #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7471,7 +7459,7 @@ msgid "Others" msgstr "دیگران" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7490,6 +7478,10 @@ msgstr "" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "بازنویسی" @@ -7914,14 +7906,11 @@ msgid "Proxy Settings" msgstr "تنظیمات پراکسی" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "" @@ -8163,14 +8152,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8247,7 +8240,8 @@ msgstr "" msgid "Reminder: Commit your change after resolve" msgstr "" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "" @@ -8770,8 +8764,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9233,7 +9227,7 @@ msgid "Show" msgstr "نمایش" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9406,8 +9400,8 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "نمایش شماره خطو&ط" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10227,6 +10221,10 @@ msgstr "فایل زیادی بزرگ است" msgid "The file is too large to open." msgstr "فایل برای بازکردن زیادی بزرگ است." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10730,12 +10728,12 @@ msgstr "" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10856,7 +10854,7 @@ msgid "Trim right" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11105,7 +11103,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11690,6 +11688,11 @@ msgstr "شما آخرین نگارش برنامه را نصب کرده اید." msgid "You asked to pull, but did not specify a remote branch." msgstr "درخواست دریافت از سرور بدون ارایه کردن یک انشعاب" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_fi.po b/Languages/Tortoise_fi.po index fda7e3a65..063d7eeb3 100644 --- a/Languages/Tortoise_fi.po +++ b/Languages/Tortoise_fi.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -16,7 +16,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Finnish (http://www.transifex.com/lznuaa/tortoisegit/language/fi/)\n" "MIME-Version: 1.0\n" @@ -1846,6 +1846,10 @@ msgstr "" msgid "Already up to date." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "" @@ -2113,10 +2117,6 @@ msgstr "Tekijät kirjainkoko huomioiden" msgid "Auto CrLf convert" msgstr "" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2143,6 +2143,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "Automaattinen täydennys ehdottaa lokiviestiä kirjoittaessasi sanoja (yleensä luokkien tai niiden jäsenien nimiä)\ntiedostoista, joita olet muuttanut." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "" @@ -2917,6 +2921,18 @@ msgstr "Väritä iän mukaan, &jatkuvana" msgid "Colors" msgstr "Värit" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3193,6 +3209,14 @@ msgstr "" msgid "Conflicts: %d" msgstr "Ristiriitoja: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "Paikkojen kontekstirivit" @@ -3315,9 +3339,9 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3548,6 +3572,10 @@ msgstr "Luo unified diff-tiedoston, jossa ovat mukana tekemäsi muutokset" msgid "Creating pull-request..." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "" @@ -3866,6 +3894,18 @@ msgstr "Ikkunoiden koot ja paikat" msgid "Dialogs" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Vertaa" @@ -3882,10 +3922,6 @@ msgstr "" msgid "Diff Viewer" msgstr "Vertailutyökalu" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Vertailutyökalu::Yhdistämistyökalu" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Vertaa lisättyjä rivejä" @@ -4375,7 +4411,7 @@ msgstr "" msgid "Either the name or IP of the proxy server" msgstr "Välityspalvelimen IP-osoite tai nimi" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "" @@ -5149,15 +5185,15 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5261,42 +5297,6 @@ msgstr "" msgid "General" msgstr "Yleinen" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Yleinen::Kontekstivalikko" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Yleinen::Ikkunat 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Yleinen::Ikkunat 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Yleinen::Ikkunat 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Hae yhdistämisloki" @@ -5425,14 +5425,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5610,14 +5602,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Toimintokomennot" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Toimintokomennot::Integrointi vikaseurantaohjelmiin" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Toimintotyyppi" @@ -5889,12 +5873,8 @@ msgid "Icon Overlays" msgstr "Kuvakepäällykset" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Kuvakepäällykset::Kuvakejoukko" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Kuvakepäällykset::Kuvakekäsittelijät" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6124,7 +6104,7 @@ msgid "Importing file %s" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6197,7 +6177,7 @@ msgstr "Lisää leikepöydän sisältö\nLiitä" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6222,6 +6202,14 @@ msgstr "Laiton rahayksikkö." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6702,6 +6690,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "Yhdistä takaisin" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6873,10 +6865,6 @@ msgstr "Sisäkkäinen" msgid "Network" msgstr "Verkko" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Uusi" @@ -7153,7 +7141,7 @@ msgstr "Huomaa, että jos päätät palauttaa automaattisesti talletetun dokumen #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7470,7 +7458,7 @@ msgid "Others" msgstr "Muut" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7489,6 +7477,10 @@ msgstr "Kohdekansio" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "Korvaa" @@ -7913,14 +7905,11 @@ msgid "Proxy Settings" msgstr "Välityspalvelimen asetukset" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "" @@ -8162,14 +8151,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8246,7 +8239,8 @@ msgstr "" msgid "Reminder: Commit your change after resolve" msgstr "" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "" @@ -8769,8 +8763,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9232,7 +9226,7 @@ msgid "Show" msgstr "Näytä" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9405,8 +9399,8 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Näytä &rivinumerot" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10226,6 +10220,10 @@ msgstr "Tiedosto on liian suuri" msgid "The file is too large to open." msgstr "Tiedosto on liian suuri avattavaksi." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10729,12 +10727,12 @@ msgstr "" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10855,7 +10853,7 @@ msgid "Trim right" msgstr "Tasoita oikealta" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11104,7 +11102,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11689,6 +11687,11 @@ msgstr "Sinulla on jo uusin ohjelmaversio." msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_fr.po b/Languages/Tortoise_fr.po index 75dce4113..719069538 100644 --- a/Languages/Tortoise_fr.po +++ b/Languages/Tortoise_fr.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -11,7 +11,7 @@ # bauland , 2014 # Benoît Locher, 2017 # Benoît Locher, 2017 -# Benoit Neil , 2019 +# Benoit Neil , 2019,2021 # Christophe SAUVEUR , 2011-2012 # deathart , 2013-2014 # Dirk Hoffmann , 2015 @@ -64,8 +64,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: 2020-10-07 09:37+0000\n" -"Last-Translator: Sven Strickroth \n" +"PO-Revision-Date: 2021-03-20 09:31+0000\n" +"Last-Translator: Benoit Neil \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" @@ -1894,6 +1894,10 @@ msgstr "Autoriser la création d'une livraison vide qui n'aurait qu'un message s msgid "Already up to date." msgstr "Déjà à jour." +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "Éditeur alternatif" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "Toujours envoyer les modifications à l'archive distante sélectionnée pour cette branche locale" @@ -2161,10 +2165,6 @@ msgstr "Auteurs sensibles à la casse" msgid "Auto CrLf convert" msgstr "Convertion automatique des fins de ligne de style Windows" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Fin de ligne auto :" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "Auto&CrLf :" @@ -2191,6 +2191,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "La complétion automatique suggère des mots (habituellement des classes ou des noms de membres)\ntirés des fichiers que vous avez changés lorsque vous tapez un commentaire." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "AutoCrLf :" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "Chargement automatique de la &clef Putty" @@ -2965,6 +2969,18 @@ msgstr "Colorer par age, de façon &continuelle" msgid "Colors" msgstr "Couleurs" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "Couleurs 1" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "Couleurs 2" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "Couleurs 3" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3178,7 +3194,7 @@ msgstr "Configurer les scripts hook" #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQADV: Control id 284) msgid "Configure Issue Tracker Integration" -msgstr "Configurer Intégration du Système de Suivi de Problèmes" +msgstr "Configurer l'intégration du traqueur d'incidents" #. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 65535) msgid "" @@ -3241,6 +3257,14 @@ msgstr "Conflits" msgid "Conflicts: %d" msgstr "Conflits : %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "Menu contextuel" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "Menu contextuel 2" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "Lignes de contexte pour le patch" @@ -3363,10 +3387,10 @@ msgstr "Impossible de trouver le super-projet" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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 "\"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." +"Could not find \"msysgit\" or \"windows\" in version string 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 "Impossible de trouver \"msysgit\" ou \"windows\" dans la chaine de version de git.exe. Si vous utilisez git dans un environnement Cygwin ou MSYS2, il est nécessaire d'activer les hacks (contournement) spéciaux.\nVous pouvez trouver plus d'informations dans l'aide avec les mots-clés \"Cygwin Git\" ou \"MSYS2 Git\"." #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) #, c-format @@ -3596,6 +3620,10 @@ msgstr "Crée un fichier de différence, au format unifié, avec toutes vos modi msgid "Creating pull-request..." msgstr "Création de demande d'extraction..." +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "Identifiant" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "L’\"Aide d’identification\" ne doit pas être vide." @@ -3914,6 +3942,18 @@ msgstr "Tailles et positions des boîtes de dialogue" msgid "Dialogs" msgstr "Boîtes de dialogue" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Différences" @@ -3930,10 +3970,6 @@ msgstr "Diff de deux livraisons" msgid "Diff Viewer" msgstr "Visualiseur de différences" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Visualiseur de différences::Outil de fusion" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Diff les lignes ajoutées" @@ -4423,7 +4459,7 @@ msgstr "Effectife" msgid "Either the name or IP of the proxy server" msgstr "Le nom ou l'adresse IP du serveur de proxy" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "Email" @@ -4813,7 +4849,7 @@ msgstr "Échec de la définition / suppression de la liste de modifications '%s' msgid "" "Failed to start the issue tracker COM provider '%1!s!'.\n" "%2!s!" -msgstr "Échec au démarrage du fournisseur COM du système de suivi des problèmes '%1!s!'.\n%2!s!" +msgstr "Échec au démarrage du fournisseur COM du système de traqueur d'incidents '%1!s!'.\n%2!s!" #. Resource IDs: (IDS_ERR_PAEGENTTIMEOUT) msgid "Failed waiting for pageant to finish loading key." @@ -5197,16 +5233,16 @@ msgstr "Transférer %d" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." -msgstr "\"msysgit\" ou \"windows\" trouvé dans le versionstring de git.exe, de plus, vous avez des personnalisations de git.exe activées. Ces personnalisations doivent être désactivées pour que Git pour Windows fonctionne correctement!\nVous pouvez trouver plus d'informations dans l'aide avec les mots-clés \"cygwin git\" ou \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." +msgstr "\"msysgit\" ou \"windows\" trouvé dans la chaine de version de git.exe, mais les hacks (contournements) de git.exe sont activées. Ces hacks doivent être désactivés pour que Git pour Windows fonctionne correctement!\nVous pouvez trouver plus d'informations dans l'aide avec les mots-clés \"Cygwin Git\" ou \"MSYS2 git\"." #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." -msgstr "Trouvé un fichier de verrouillage indiquant qu'un processus de base TortoiseGit est en cours d'exécution. Cela bloque cette opération.\n\nSi vous n'exécutez pas de processus Tortoise Git rebase pour le moment, vous pouvez supprimer le fichier de verrouillage obsolète pour continuer." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +msgstr "Un fichier de verrouillage indiquant qu'un processus de rebase de TortoiseGit est en cours d'exécution a été trouvé. Cela bloque cette opération.\n\nSi vous n'exécutez pas de processus de rebase Tortoise Git pour le moment, vous pouvez supprimer le fichier de verrouillage obsolète pour continuer." #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) msgid "" @@ -5309,42 +5345,6 @@ msgstr "Récupération des statistiques" msgid "General" msgstr "Général" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "Général::Éditeur alternatif" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "Général::Couleurs 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "Général::Couleurs 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "Général::Couleurs 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Général::Menu Contextuel" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "Général::Menu Contextuel 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Général::Boîtes de dialogue 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Général::Boîtes de dialogue 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Général::Boîtes de dialogue 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Obtenir les journaux de fusion" @@ -5473,14 +5473,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "Git utilise le concept d'une configuration hiérarchique.\nI.e. il y a plusieurs niveaux; paramètres d'un plus haut niveau écrasent ceux d'un niveau plus faible.\nL'onglet \"Effectif\" vous montre les valeurs effective pour la portée actuelle (lecture seule).\nChoisissez n'importe quel niveau pour voir les valeurs qui y sont sauvegardées.\nAfin de changer paramètres , sélectionner un niveau, entrer les valeurs et sélectionner ou les sauvegarder." -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "Git::Credential" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "Git::Distant" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5658,14 +5650,6 @@ msgstr "Conseil : Les messages des commits récents sont disponibles en faisant msgid "Hook Scripts" msgstr "Scripts d'Accroche" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "Scripts d'Accroche::Configuration du Système de Suivi de Problèmes" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Scripts d'Accroche::Intégration du Système de Suivi de Problèmes" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Type de hook" @@ -5937,12 +5921,8 @@ msgid "Icon Overlays" msgstr "Recouvrements d'icône" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Recouvrements d'icône::Jeu d'icônes" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Recouvrements d'icône::Gestionnaires de Recouvrement" +msgid "Icon Set" +msgstr "Jeu d'icônes" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6172,8 +6152,8 @@ msgid "Importing file %s" msgstr "Import du fichier %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" -msgstr "Dans la Liste de changements" +msgid "In Changelist" +msgstr "Liste de changements entrants" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) msgid "In Commits" @@ -6245,7 +6225,7 @@ msgstr "Insérer le presse papiers\nColler" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "Au lieu de pointer le HEAD nouvellement créé vers la branche pointée par le HEAD du dépôt cloné, pointez plutôt sur une branche spécifique." #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6270,6 +6250,14 @@ msgstr "Monnaie Invalide." msgid "Invalid revision number!" msgstr "Numéro de révision invalide!" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "Configuration du traqueur d'incidents" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "Intégration de traqueur d'incidents" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "Rapporteur:" @@ -6750,6 +6738,10 @@ msgstr "Point de fusion" msgid "Merge Reintegrate" msgstr "Fusionner Réintégrer" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "Outil de fusion" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6921,10 +6913,6 @@ msgstr "Niché" msgid "Network" msgstr "Réseau" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "Réseau::Courriel" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Nouveau" @@ -7201,8 +7189,8 @@ msgstr "Notez que si vous choisissez de récupérer les documents automatiquemen #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." -msgstr "Note: ces réglages s'appliquent aussi à la fenêtre de visualisation des Patchs.\nPour sélectionner de quelle manière vous voudriez utiliser la version intégrée ou un autre programme de visualisation aller à \"Visualisateur de différences\" dans les préférences dans l'arbre à gauche." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +msgstr "Note : ces réglages s'appliquent aussi à la fenêtre de visualisation des Patchs.\nPour sélectionner de quelle manière vous voudriez utiliser la version intégrée ou un autre programme de visualisation, allez à \"Visualisateur de différences\" dans les préférences dans l'arbre à gauche." #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) msgid "Note: the folder contains unversioned items" @@ -7518,8 +7506,8 @@ msgid "Others" msgstr "Autres" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" -msgstr "Sortir la liste de changements" +msgid "Out Changelist" +msgstr "Liste de changements sortants" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) msgid "Out Commits" @@ -7537,6 +7525,10 @@ msgstr "Répertoire de sortie" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "Remplacer" @@ -7961,14 +7953,11 @@ msgid "Proxy Settings" msgstr "Configuration du Proxy" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "Séparer" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "Séparer (Tous les distants)" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "Tirer" @@ -8210,14 +8199,18 @@ msgid "Ref List" msgstr "Liste de référence" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" -msgstr "Parcourir Ref" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" +msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "Journal de référence" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "Les références sont validées" @@ -8294,7 +8287,8 @@ msgstr "Mémoriser la sélection (option \"svn.rmdir\")" msgid "Reminder: Commit your change after resolve" msgstr "Rappel : Livrez vos modifications après résolution" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "Distant" @@ -8817,8 +8811,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "SafeCrLf :" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9092,7 +9086,7 @@ msgstr "Sélectionner un fichier" #. Resource IDs: (IDS_SETTINGS_BUGTRAQ_SELECTFOLDERPATH) msgid "Select folder to associate with this issue tracker" -msgstr "Sélectionnez le répertoire à associer avec ce système de suivi de problèmes" +msgstr "Sélectionnez le répertoire à associer avec ce système de traqueur d'incidents" #. Resource IDs: (IDS_PROC_EXPORT_1) msgid "" @@ -9280,8 +9274,8 @@ msgid "Show" msgstr "Afficher" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" -msgstr "Voir le journal de &référence" +msgid "Show &RefLog" +msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, #. IDS_PROC_LOG_SHOWUNVERSIONED) @@ -9453,7 +9447,7 @@ msgid "Show la&beled commits only" msgstr "Afficher uniquement les commentaires rédigés" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" +msgid "Show line number&s" msgstr "Voir les numéros de ligne&s" #. Resource IDs: (IDS_MENULFSLOCKS) @@ -10274,6 +10268,10 @@ msgstr "Le fichier est trop volumineux." msgid "The file is too large to open." msgstr "Le fichier est trop volumineux pour être ouvert." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "Le fichier a été modifié. Voulez-vous enregistrer les changements ?" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10777,12 +10775,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10903,8 +10901,8 @@ msgid "Trim right" msgstr "découper à droite" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" -msgstr "Faites confiance au code de sortie de l'outil de fusion externe pour la résolution automatique" +msgid "Trust the exitcode of the external merge tool for auto resolving" +msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." @@ -11152,8 +11150,8 @@ msgid "Use .mailmap" msgstr "Utiliser .mailmap" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" -msgstr "Utiliser Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" +msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) msgid "Use HTTP path component" @@ -11737,6 +11735,11 @@ msgstr "Vous avez déjà la dernière version installée." msgid "You asked to pull, but did not specify a remote branch." msgstr "Vous avez demandé un tirage, mais n'avez pas spécifié de branche distante." +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_hu.po b/Languages/Tortoise_hu.po index 46b83b50c..e6fa3db4e 100644 --- a/Languages/Tortoise_hu.po +++ b/Languages/Tortoise_hu.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -13,6 +13,7 @@ # Hgrg , 2013 # Hgrg , 2013,2017 # kla , 2020 +# Marcus --, 2020 # Máté Széles , 2018 # Péter Handbauer , 2014-2016 # Petrovics Sándor , 2014,2016 @@ -22,7 +23,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Hungarian (http://www.transifex.com/lznuaa/tortoisegit/language/hu/)\n" "MIME-Version: 1.0\n" @@ -917,7 +918,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1241) msgid "&Message:" -msgstr "" +msgstr "&Megjegyzés:" #. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1551, Dialog IDD_RESET: #. Control id 1551) @@ -967,7 +968,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1702) msgid "&None" -msgstr "" +msgstr "E&gyik sem" #. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 1661) msgid "&Notepad2" @@ -1689,7 +1690,7 @@ msgstr "Hozzáadás" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1482) msgid "Add &Signed-off-by" -msgstr "" +msgstr "Jóváhagyás &hozzáadása" #. Resource IDs: (IDS_SCIEDIT_ADDWORD) #, c-format @@ -1852,6 +1853,10 @@ msgstr "" msgid "Already up to date." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "" @@ -1870,11 +1875,11 @@ msgstr "Mindig a helyi rendszerbeállítást használja a dátum/idő megjelení #. Resource IDs: (IDS_AMENDBUTTON) msgid "Amend" -msgstr "" +msgstr "Utolsó beküldés &javítása" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1555) msgid "Amend &Last Commit" -msgstr "" +msgstr "Utolsó beküldés &javítása" #. Resource IDs: (IDS_SETTINGS_ALTERNATIVEEDITOR_TT) msgid "" @@ -2119,10 +2124,6 @@ msgstr "Fejlesztők nevében számít a kisbetű/nagybetű" msgid "Auto CrLf convert" msgstr "" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2149,6 +2150,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "A szókiegészítés szavakat (általában osztály- és tagneveket) ajánl fel\na megjegyzés írása közben, azokból a fájlokból, amelyeket megváltoztattál." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "" @@ -2370,7 +2375,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1119) msgid "Bug-ID/Issue-Nr:" -msgstr "" +msgstr "Hibajegy azonosító:" #. Resource IDs: (IDS_LOG_FILTER_BUGIDS) msgid "Bug-IDs" @@ -2412,7 +2417,7 @@ msgstr "&Keresés most" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1, IDS_COMMIT_COMMIT) msgid "C&ommit" -msgstr "" +msgstr "&Beküldés" #. Resource IDs: (IDS_LOG_POPUP_COMMIT) msgid "C&ommit..." @@ -2923,6 +2928,18 @@ msgstr "" msgid "Colors" msgstr "Színek" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3199,6 +3216,14 @@ msgstr "Konfliktusok" msgid "Conflicts: %d" msgstr "Konfliktusok: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "" @@ -3321,9 +3346,9 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3554,6 +3579,10 @@ msgstr "Egy egyesített diff fájlt készít a módosításaid alapján" msgid "Creating pull-request..." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "" @@ -3872,6 +3901,18 @@ msgstr "Ablakok helyzete és mérete" msgid "Dialogs" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "" @@ -3888,10 +3929,6 @@ msgstr "Két beküldés összehasonlítása" msgid "Diff Viewer" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "" @@ -4051,7 +4088,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1669) msgid "Do not autoselect submodules" -msgstr "" +msgstr "&Almodulok automatikus kijelölésének kikapcsolása" #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "Do not show the context menu for the following paths:" @@ -4381,7 +4418,7 @@ msgstr "" msgid "Either the name or IP of the proxy server" msgstr "A proxy IP- vagy webcíme" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "Email" @@ -5155,15 +5192,15 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5267,42 +5304,6 @@ msgstr "" msgid "General" msgstr "Általános" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "Általános::Színek 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "Általános::Színek 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "Általános::Színek 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Általános::Helyi menü" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "Általános::Helyi menü 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Általános::Ablakok 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Általános::Ablakok 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Általános::Ablakok 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Összefésülési naplók" @@ -5431,14 +5432,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5616,14 +5609,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Hook szkriptek" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Hook szkriptek::Hibakövető integrálása" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Hook típusa" @@ -5895,12 +5880,8 @@ msgid "Icon Overlays" msgstr "Ikonok" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Ikonok::Stílusok" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Ikonok::Rátét kezelők" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6130,7 +6111,7 @@ msgid "Importing file %s" msgstr "%s importálása" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6203,7 +6184,7 @@ msgstr "A vágólap tartalmának beillesztése\nBeillesztés" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6228,6 +6209,14 @@ msgstr "Rossz pénznem." msgid "Invalid revision number!" msgstr "Érvénytelen verziószám!" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6708,6 +6697,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "Visszaintegrálás" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6742,7 +6735,7 @@ msgstr "Megjegyzés" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1719) msgid "Message onl&y" -msgstr "" +msgstr "Csak a megjeg&yzés módosítása" #. Resource IDs: (Dialog IDD_BUGTRAQREGEXTESTER: Control id 1579) msgid "Message part &expression:" @@ -6879,10 +6872,6 @@ msgstr "Alábontott" msgid "Network" msgstr "Hálózat" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Új" @@ -7159,7 +7148,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7476,7 +7465,7 @@ msgid "Others" msgstr "Többiek" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7495,6 +7484,10 @@ msgstr "Célmappa" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "" @@ -7919,14 +7912,11 @@ msgid "Proxy Settings" msgstr "Proxy beállítások" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "" @@ -8168,14 +8158,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8252,7 +8246,8 @@ msgstr "" msgid "Reminder: Commit your change after resolve" msgstr "" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "" @@ -8775,8 +8770,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9180,11 +9175,11 @@ msgstr "A szerver &címe:" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1558) msgid "Set au&thor" -msgstr "" +msgstr "&Fejlesztő nevének beállítása" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1557) msgid "Set author &date" -msgstr "" +msgstr "Készítés &időpontjának megadása" #. Resource IDs: (IDS_PUSHDLG_PUSHREMOTE_TT) msgid "Sets the remote as the \"pushremote\" for the selected local branch." @@ -9238,18 +9233,18 @@ msgid "Show" msgstr "Megtekintés" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, #. IDS_PROC_LOG_SHOWUNVERSIONED) msgid "Show &Unversioned Files" -msgstr "" +msgstr "Nem verziókezelt fájlok m&utatása" #. Resource IDs: (Dialog IDD_CHANGEDFILES: Control id 1203, Dialog #. IDD_COMMITDLG: Control id 1203, Dialog IDD_LOGMESSAGE: Control id 1203) msgid "Show &Whole Project" -msgstr "" +msgstr "Teljes &projekt mutatása" #. Resource IDs: (Dialog IDD_RESOLVE_CONFLICT: Control id 1133, Dialog #. IDD_RESOLVE_CONFLICT: Control id 1134, IDS_LOG_POPUP_DIFF) @@ -9380,7 +9375,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1556) msgid "Show diff to last commit" -msgstr "" +msgstr "Utolsó beküldés óta történt változások mut&atása" #. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1126) msgid "Show excluded folders as normal" @@ -9411,8 +9406,8 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Sorszámo&k mutatása" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -9917,7 +9912,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_CLEAN: Control id 1708, Dialog IDD_COMMITDLG: #. Control id 1708) msgid "Submodules" -msgstr "" +msgstr "Almodulok" #. Resource IDs: (IDS_CLONE_RECURSIVE_TT) msgid "Submodules are initialized and cloned using their default settings." @@ -10232,6 +10227,10 @@ msgstr "A fájl túl nagy" msgid "The file is too large to open." msgstr "A fájl túl nagy a megnyitáshoz." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10735,12 +10734,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10861,7 +10860,7 @@ msgid "Trim right" msgstr "Vágás jobbra" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11110,7 +11109,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11454,7 +11453,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" -msgstr "" +msgstr "Patch megtekintése" #. Resource IDs: (IDS_LOG_POPUP_VIEWPATHREV) msgid "View revision for path in &webviewer" @@ -11695,6 +11694,11 @@ msgstr "A legfrissebb verzió van feltelepítve" msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_id.po b/Languages/Tortoise_id.po index 5d2c8d149..25dc8e7af 100644 --- a/Languages/Tortoise_id.po +++ b/Languages/Tortoise_id.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -23,7 +23,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Indonesian (http://www.transifex.com/lznuaa/tortoisegit/language/id/)\n" "MIME-Version: 1.0\n" @@ -1853,6 +1853,10 @@ msgstr "" msgid "Already up to date." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "" @@ -2120,10 +2124,6 @@ msgstr "Sensitif huruf Pengarang" msgid "Auto CrLf convert" msgstr "" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2150,6 +2150,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "Pelengkap otomatis menyarankan kata-kata (biasanya nama kelas atau anggota)\ndari berkas yang telah Anda ubah saat Anda mengetik pesan log." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "" @@ -2924,6 +2928,18 @@ msgstr "" msgid "Colors" msgstr "Warna" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3200,6 +3216,14 @@ msgstr "" msgid "Conflicts: %d" msgstr "Konflik: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "" @@ -3322,9 +3346,9 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3555,6 +3579,10 @@ msgstr "Membuat berkas unified diff dengan semua perubahan yang anda buat" msgid "Creating pull-request..." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "" @@ -3873,6 +3901,18 @@ msgstr "Ukuran dan posisi dialog" msgid "Dialogs" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Diff" @@ -3889,10 +3929,6 @@ msgstr "" msgid "Diff Viewer" msgstr "Peninjau Diff" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "" @@ -4382,7 +4418,7 @@ msgstr "" msgid "Either the name or IP of the proxy server" msgstr "Baik nama ataupun IP dari server proxy" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "" @@ -5156,15 +5192,15 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5268,42 +5304,6 @@ msgstr "" msgid "General" msgstr "Umum" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "Umum::Warna 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "Umum::Warna 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "Umum::Warna 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Umum::Menu Konteks" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "Umum::Menu Konteks 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Umum::Dialog 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Umum::Dialog 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Umum::Dialog 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Dapatkan log penggabungan" @@ -5432,14 +5432,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5617,14 +5609,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Naskah Hook" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Naskah Hook::Integrasi Pelacak Isu" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Tipe Hook" @@ -5896,12 +5880,8 @@ msgid "Icon Overlays" msgstr "Lapisan Ikon" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Lapisan Ikon::Set Ikon" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Lapisan Ikon::Penangan Hamparan" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6131,7 +6111,7 @@ msgid "Importing file %s" msgstr "Mengimpor file %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6204,7 +6184,7 @@ msgstr "Sisipkan isi Clipboard\nPaste" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6229,6 +6209,14 @@ msgstr "Mata Uang tidak Sahih." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6709,6 +6697,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "Gabung Reintegrasi" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6880,10 +6872,6 @@ msgstr "Berulang" msgid "Network" msgstr "Jaringan" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Baru" @@ -7160,7 +7148,7 @@ msgstr "Harap diingat bahwa jika anda memilih untuk memulihkan dokumen secara si #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7477,7 +7465,7 @@ msgid "Others" msgstr "Lainnya" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7496,6 +7484,10 @@ msgstr "" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "" @@ -7920,14 +7912,11 @@ msgid "Proxy Settings" msgstr "Seting Proxy" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "Pull" @@ -8169,14 +8158,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8253,7 +8246,8 @@ msgstr "" msgid "Reminder: Commit your change after resolve" msgstr "" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "Remote" @@ -8776,8 +8770,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9239,7 +9233,7 @@ msgid "Show" msgstr "Tampilkan" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9412,8 +9406,8 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Tampilkan nomor bari&s" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10233,6 +10227,10 @@ msgstr "Berkas terlalu besar." msgid "The file is too large to open." msgstr "Berkas terlalu besar untuk dibuka." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10736,12 +10734,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10862,7 +10860,7 @@ msgid "Trim right" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11111,7 +11109,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11696,6 +11694,11 @@ msgstr "Anda sudah mempunyai versi terbaru diinstalasi." msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_it.po b/Languages/Tortoise_it.po index 0343bf8fa..6ccfe7625 100644 --- a/Languages/Tortoise_it.po +++ b/Languages/Tortoise_it.po @@ -1,11 +1,12 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # # Translators: # acehigh, 2011 # Alessio , 2014 +# Alessio Cuccovillo , 2020-2021 # Andrea Re , 2018 # Andrea Tuscano , 2016 # Antonio , 2013 @@ -35,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: 2020-10-07 09:37+0000\n" -"Last-Translator: Sven Strickroth \n" +"PO-Revision-Date: 2021-03-21 00:15+0000\n" +"Last-Translator: Alessio Cuccovillo \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" @@ -164,12 +165,12 @@ msgstr "%1!d! anni fà" #. Resource IDs: (IDS_PROC_SYNC_COMMITSAHEAD) #, c-format msgid "%1!d! commits ahead \"%2!s!\"" -msgstr "" +msgstr "%1!d! commits dopo \"%2!s!\"" #. Resource IDs: (IDS_STATUSLIST_FILESREVERTED) #, c-format msgid "%1!d! files reverted to %2!s!." -msgstr "" +msgstr "%1!d! file ripristinati a %2!s!." #. Resource IDs: (IDS_COMMITDLG_STATISTICSFORMAT) #, c-format @@ -205,22 +206,22 @@ msgstr "%1!s! (%2!s!)" #. Resource IDs: (IDS_PROGRS_PATHATREV) #, c-format msgid "%1!s! - at revision: %2!d!" -msgstr "" +msgstr "%1!s! - alla revisione: %2!d!" #. Resource IDs: (IDS_PROGRS_FINALINFO) #, c-format msgid "%1!s! in %2!s!" -msgstr "" +msgstr "%1!s! in %2!s!" #. Resource IDs: (IDS_GITVER_REQUIRED) #, c-format msgid "%1!s! requires Git >= %2!s!" -msgstr "" +msgstr "%1!s! richiede Git >= %2!s!" #. Resource IDs: (IDS_SVN_PROGRESS_TOTALANDSPEED) #, c-format msgid "%1!s!, at %2!s!" -msgstr "" +msgstr "%1!s!, a %2!s!" #. Resource IDs: (IDS_REPOBROWSE_INFO) #, c-format @@ -344,7 +345,7 @@ msgstr "&Interrompi" msgid "" "&Abort\n" "You can fix the reason the hook script failed first." -msgstr "" +msgstr "&Annulla\nÈ possibile correggere prima il motivo per cui lo script hook non è riuscito." #. Resource IDs: (ID_APP_ABOUT - Menu) msgid "&About TortoiseGitBlame..." @@ -519,7 +520,7 @@ msgstr "&Copia\tCtrl+C" #. Resource IDs: (Dialog IDD_FIRSTSTARTWIZARD_AUTHENTICATION: Control id #. 65535) msgid "&Credential helper:" -msgstr "" +msgstr "Aiuto &credenziali" #. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 1662) msgid "&Custom" @@ -527,11 +528,11 @@ msgstr "&Personalizzato" #. Resource IDs: (ID_VIEW_DARKMODE - Menu) msgid "&Dark Mode" -msgstr "" +msgstr "Modalità &scura" #. Resource IDs: (ID_VIEW_DARKMODE - Menu) msgid "&Dark Mode\tD" -msgstr "" +msgstr "Modalità &Scura\tS" #. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1269) msgid "&Default" @@ -552,7 +553,7 @@ msgstr "&Cancella Filtro" #. Resource IDs: (IDS_PROC_DELETEREMOTEBRANCH_LOCALREMOTE) msgid "&Delete branch on remote && local remote-tracking branch" -msgstr "" +msgstr "&Elimina ramo remoto && tracking locale" #. Resource IDs: (IDS_DELETE_BRANCHTAG) msgid "&Delete branch/tag" @@ -741,7 +742,7 @@ msgstr "&Forza Rebase" #. Resource IDs: (IDS_CREATE_PATCH) msgid "&Format Patch..." -msgstr "" +msgstr "&Formato Patch..." #. Resource IDs: (Dialog IDD_CLONE: Control id 1608) msgid "&From:" @@ -910,7 +911,7 @@ msgstr "&Unisci" #. Resource IDs: (IDS_LOG_POPUP_MERGEREV) #, c-format msgid "&Merge to \"%s\"..." -msgstr "" +msgstr "&Unisci a \"%s\"..." #. Resource IDs: (IDS_MERGE_UNRELATED) msgid "&Merge unrelated history" @@ -935,7 +936,7 @@ msgstr "&Messaggio:" #. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1551, Dialog IDD_RESET: #. Control id 1551) msgid "&Mixed: Leave working tree untouched, reset index" -msgstr "" +msgstr "&Misto: Lascia albero attuale, reimposta indici" #. Resource IDs: (ID_VIEW_MOVEDBLOCKS - Menu) msgid "&Moved blocks" @@ -1025,7 +1026,7 @@ msgstr "&Sovrapponi immagini\tO" #. Resource IDs: (Dialog IDD_GITSWITCH: Control id 1523) msgid "&Override branch if exists" -msgstr "" +msgstr "&Sovrascrivi ramo se esiste" #. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 1411, Dialog #. IDD_SIMPLEPROMPT: Control id 65535, Dialog IDD_USER_PASSWD: Control id @@ -1066,7 +1067,7 @@ msgstr "&Procedi" msgid "" "&Proceed anyway\n" "Ignore the hook script and run the command anyway." -msgstr "" +msgstr "&Procedi ugualmente\nIgnora lo script hook ed esegui ugualmente il comando." #. Resource IDs: (IDS_PROC_SYNC_PULL) msgid "&Pull" @@ -1176,7 +1177,7 @@ msgstr "&Annullare le modifiche apportate da questo commit" msgid "" "&Run\n" "Run the hook script" -msgstr "" +msgstr "&Esegui\nEsegui lo script hook" #. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 65535) msgid "&SSH client:" @@ -1234,7 +1235,7 @@ msgstr "&Salta" #. Resource IDs: (Dialog IDD_RESET: Control id 1550) msgid "&Soft: Leave working tree and index untouched" -msgstr "" +msgstr "&Leggero: Lascia albero attuale e gli indici intatti" #. Resource IDs: (Dialog IDD_MERGE: Control id 1524, Dialog IDD_PULLFETCH: #. Control id 1524) @@ -1259,7 +1260,7 @@ msgstr "&Barra di stato" #. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 1849) msgid "&Store credentials..." -msgstr "" +msgstr "&Salva credenziali" #. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1525) msgid "&Switch to new branch" @@ -1267,7 +1268,7 @@ msgstr "&Passa a un nuovo ramo" #. Resource IDs: (IDS_SWITCH_BRANCH) msgid "&Switch/Checkout to" -msgstr "" +msgstr "&Passa a" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 1173) msgid "&Symbol View" @@ -1347,7 +1348,7 @@ msgstr "&Unità sconosciute" #. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 32927) msgid "&Unlock" -msgstr "" +msgstr "&Sblocca" #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" @@ -1377,7 +1378,7 @@ msgstr "&Visualizza" #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1851) msgid "&View effective config" -msgstr "" +msgstr "&Visualizza configurazione effettiva" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 65535) msgid "&Warn on missing Signed-Off-By on commit" @@ -1414,7 +1415,7 @@ msgstr "&cambiamenti conosciuti" #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" -msgstr "" +msgstr "(TortoiseGit default)" #. Resource IDs: (IDS_STATUSLIST_FROM) #, c-format @@ -1723,11 +1724,11 @@ msgstr "Aggiungere un altro commit?" #. Resource IDs: (IDS_STATUSLIST_CONTEXT_ADD_EXE) msgid "Add as Executable (+x)" -msgstr "" +msgstr "Aggiungi come Eseguibile (+x)" #. Resource IDs: (IDS_STATUSLIST_CONTEXT_ADD_LINK) msgid "Add as Symlink" -msgstr "" +msgstr "Aggiungi come link simbolico" #. Resource IDs: (IDS_DLGTITLE_ADD_DIFF_TOOL) msgid "Add extension specific diff program" @@ -1865,6 +1866,10 @@ msgstr "Consente di creare un commit vuoto, solo con un messaggio di commit e se msgid "Already up to date." msgstr "Già aggiornato." +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "Editor alternativo" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "Esegui sempre il Push sull'archivio remoto selezionato per questo ramo locale" @@ -2132,10 +2137,6 @@ msgstr "Non fare differenza tra maiuscole e minuscole nei nomi degli autori" msgid "Auto CrLf convert" msgstr "Conversione automatica CrLf" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2162,6 +2163,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "L'autocompletamento suggerisce parole (di solito classi o nomi di membri)\ndai file che avete modificato durante la digitazione dei commenti." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "Carica automaticamente la c&hiave Putty" @@ -2936,6 +2941,18 @@ msgstr "Colore in base all'età, &continuo" msgid "Colors" msgstr "Colori" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3212,6 +3229,14 @@ msgstr "Conflitti" msgid "Conflicts: %d" msgstr "Conflitti: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "" @@ -3334,10 +3359,10 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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 "Impossibile trovare 'msysgit' o 'windows' nella versione di git.exe.\nSe stai usando git dell'ambiente cygwin o msys2 devi abilitare hack speciali.\nPer ulteriori informazioni, consultare il file della guida, parola chiave '\"cygwin git\" o \"msys2 git\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) #, c-format @@ -3567,6 +3592,10 @@ msgstr "Crea un file unificato di confronto per tutte le modifiche apportate" msgid "Creating pull-request..." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "" @@ -3885,6 +3914,18 @@ msgstr "Dimensione e posizione delle finestre di dialogo" msgid "Dialogs" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Differenze" @@ -3901,10 +3942,6 @@ msgstr "Diff due Commit" msgid "Diff Viewer" msgstr "Visualizzatore differenze" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Visualizzatore differenze::Strumento unione" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Linee aggiunte" @@ -4394,7 +4431,7 @@ msgstr "" msgid "Either the name or IP of the proxy server" msgstr "Il nome o l'indirizzo IP del server proxy" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "Email" @@ -5168,16 +5205,16 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." -msgstr "Trovato \"msysgit\" o \"windows\" nella versione di git.exe, tuttavia hai abilitato gli hack di git.exe. Questi hack devono essere disabilitati per il corretto funzionamento con Git per Windows!\nUlteriori informazioni sono disponibili nel file della guida per la parola chiave \"cygwin git\" o \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." +msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." -msgstr "Trovato un file di blocco che indica che è in esecuzione un processo rebase TortoiseGit. Questo blocca questa operazione.\n\nSe non stai eseguendo un processo rebase TortoiseGit in questo momento, puoi rimuovere il file di blocco non aggiornato per continuare." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) msgid "" @@ -5280,42 +5317,6 @@ msgstr "" msgid "General" msgstr "Generale" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "Generale::Colori 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "Generale::Colori 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "Generale::Colori 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Generale::Menu contestuale" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "Generale::Menu contestuale 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Generale::Finestre di dialogo 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Generale::Finestre di dialogo 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Generale::Finestre di dialogo 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Richiedi registri attività di fusione" @@ -5444,14 +5445,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "Git usa il concetto di configurazione gerarchica.\nCioè ci sono più livelli; le impostazioni ai livelli più alti sovrascrivono i valori ai livelli più bassi.\nLa tabella \"Effective\" mostra i valori effettivi per l'ambito corrente (sola lettura).\nSeleziona un livello qualsiasi per vedere i valori memorizzati lì.\nPer modificare le impostazioni selezionare un livello, inserire i valori e selezionare dove archiviare." -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5629,14 +5622,6 @@ msgstr "Suggerimento: i messaggi di commit utilizzati di recente sono disponibil msgid "Hook Scripts" msgstr "Script aggancio" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Script aggancio::Integrazione Issue Tracker" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Tipo agagncio" @@ -5908,12 +5893,8 @@ msgid "Icon Overlays" msgstr "Sovrapposizioni icona" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Sovrapposizioni icona::Set di icone" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Sovrapposizioni icona::Gestori sovrapposizione" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6143,7 +6124,7 @@ msgid "Importing file %s" msgstr "Importazione del file %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6216,8 +6197,8 @@ msgstr "Inserisce il contenuto degli Appunti\nIncolla" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." -msgstr "Invece di puntare al HEAD appena creato sul ramo indicato dal HEAD del repository clonato, puntare invece al ramo specifico." +"cloned repository's HEAD, point to specific branch instead." +msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) msgid "" @@ -6241,6 +6222,14 @@ msgstr "Valuta non valida." msgid "Invalid revision number!" msgstr "Numero di revisione non valido!" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6721,6 +6710,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "Unisci reintegrazioni" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6892,10 +6885,6 @@ msgstr "Annidato" msgid "Network" msgstr "Rete" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "Network::Email" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Nuovo" @@ -7172,7 +7161,7 @@ msgstr "Nota che se scegli di recuperare i documenti salvati automaticamente, de #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7489,7 +7478,7 @@ msgid "Others" msgstr "Altri" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7508,6 +7497,10 @@ msgstr "" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "" @@ -7932,14 +7925,11 @@ msgid "Proxy Settings" msgstr "Configurazione proxy" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "Pull" @@ -8181,14 +8171,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8265,7 +8259,8 @@ msgstr "" msgid "Reminder: Commit your change after resolve" msgstr "" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "Remoto" @@ -8788,8 +8783,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9251,7 +9246,7 @@ msgid "Show" msgstr "Visualizza" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9424,8 +9419,8 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Mo&stra i numeri di linea" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10245,6 +10240,10 @@ msgstr "Il file è troppo grande" msgid "The file is too large to open." msgstr "Il file è troppo grande per essere aperto." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10748,12 +10747,12 @@ msgstr "TortoiseGitBlame, Versione %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10874,7 +10873,7 @@ msgid "Trim right" msgstr "Ritaglia a destra" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11123,7 +11122,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11708,6 +11707,11 @@ msgstr "Si sta già utilizzando la versione più recente." msgid "You asked to pull, but did not specify a remote branch." msgstr "Hai chiesto un \"pull\", ma non hai specificato un ramo remoto." +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_ja.po b/Languages/Tortoise_ja.po index 48567d880..7b543229f 100644 --- a/Languages/Tortoise_ja.po +++ b/Languages/Tortoise_ja.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -12,7 +12,7 @@ # fshin, 2019 # hirose y , 2012,2017 # Ilias-Dimitrios Vrachnis, 2013 -# タカハシ , 2013 +# タカハシ, 2013 # Joseph Ting , 2017 # Koto <>, 2012 # Lübbe , 2012 @@ -21,6 +21,7 @@ # Osamu NAKAMURA, 2013 # Ratnadeep Debnath , 2012 # Shinya Okano , 2011 +# S.Tsukamoto , 2021 # Susumu Fukuda , 2017 # Sven Strickroth , 2012-2013,2018 # Tadashi Jokagi , 2011 @@ -29,7 +30,7 @@ # Tatsuya Ishikawa, 2019 # Tetsuhiko Koto, 2014 # Tetsuhiko Koto, 2012-2014 -# Tetsuhiko Koto, 2014-2020 +# Tetsuhiko Koto, 2014-2021 # Tetsuya Morimoto , 2011 # YANO Tetsu , 2012-2013 # YANO Tetsu , 2013 @@ -37,15 +38,15 @@ # hirose y , 2012 # Yoshitaka Yamashita , 2013 # youten, 2011 -# 大川剛 , 2016 -# 藤本理弘 , 2013,2015,2017,2019 +# Tsuyoshi Okawa , 2016 +# 藤本理弘 , 2013,2015,2017,2019-2021 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: 2020-10-07 09:37+0000\n" -"Last-Translator: Sven Strickroth \n" +"PO-Revision-Date: 2021-03-14 03:31+0000\n" +"Last-Translator: 藤本理弘 \n" "Language-Team: Japanese (http://www.transifex.com/lznuaa/tortoisegit/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -721,7 +722,7 @@ msgstr "画像をウィンドウサイズに合わせる(&F)\tF" #. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1050) msgid "&Fixed drives" -msgstr "固定ドライブ(&F)" +msgstr "ハードディスクドライブ(&F)" #. Resource IDs: (IDS_WALKBEHAVIOUR_FOLLOWRENAMES, ID_VIEW_FOLLOWRENAMES - #. Menu) @@ -1874,6 +1875,10 @@ msgstr "空のコミット (コミットメッセージはあるがファイル msgid "Already up to date." msgstr "最新状態です。" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "代替エディタ" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "このローカルブランチでのpushを常に指定のリモートアーカイブへのプッシュとする" @@ -2141,10 +2146,6 @@ msgstr "作者名の大文字/小文字を区別する" msgid "Auto CrLf convert" msgstr "自動改行コード変換" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "AutoCrLf(&C):" @@ -2171,6 +2172,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "ログメッセージを入力する際に、変更したファイル内の単語\n（クラスやメンバの名前など）が自動補完により提示されます。" +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "AutoCrLf:" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "Putty 鍵の自動ロード(&K)" @@ -2945,6 +2950,18 @@ msgstr "変更時期に応じて徐々に色を変える(&c)" msgid "Colors" msgstr "色" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "色 1" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "色 2" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "色 3" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3221,6 +3238,14 @@ msgstr "競合" msgid "Conflicts: %d" msgstr "競合: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "コンテキストメニュー" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "コンテキストメニュー 2" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "パッチのコンテキスト行数" @@ -3343,10 +3368,10 @@ msgstr "親プロジェクトが見つかりません" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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 "git.exe のバージョン文字列に \"msysgit\" または \"windows\" が見つかりませんでした。\ncygwinまたはmsys2環境のgitを使用している場合は、特別なハックを有効にする必要があります。\n詳細については、ヘルプファイルをキーワード \"cygwin git\" または \"msys2 git\" で参照してください。" +"Could not find \"msysgit\" or \"windows\" in version string 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 "git.exe のバージョン文字列に \"msysgit\" または \"windows\" が見つかりませんでした。\nCygwin または MSYS2 環境の git を使用している場合は、特別なハックを有効にする必要があります。\n詳細については、ヘルプファイルをキーワード \"Cygwin git\" または \"MSYS2 git\" で参照してください。" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) #, c-format @@ -3576,6 +3601,10 @@ msgstr "すべての変更をもとにUnified形式の差分ファイルを作 msgid "Creating pull-request..." msgstr "プルリクエスト作成..." +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "資格情報" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "資格情報ヘルパーは、空欄に出来ません。" @@ -3894,6 +3923,18 @@ msgstr "ダイアログのサイズと位置" msgid "Dialogs" msgstr "ダイアログ" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "ダイアログ 1" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "ダイアログ 2" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "ダイアログ 3" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "差分" @@ -3910,10 +3951,6 @@ msgstr "２つのコミットの差分" msgid "Diff Viewer" msgstr "差分ビューア" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "差分ビューア::マージツール" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "diffの追加された行" @@ -4403,7 +4440,7 @@ msgstr "実効値" msgid "Either the name or IP of the proxy server" msgstr "プロキシサーバーの名前もしくは IP を入力します" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "メール" @@ -5177,16 +5214,16 @@ msgstr "前進 %d" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." -msgstr "git.exe のバージョン文字列に \"msysgit\" または \"windows\" が見つかったにもかかわらず、特別なハックが有効になっています。これらのハックは Git for Windows を利用する場合無効にする必要があります。\n詳細については、ヘルプファイルをキーワード \"cygwin git\" または \"msys2 git\" で参照してください。" +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." +msgstr "git.exe のバージョン文字列に \"msysgit\" または \"windows\" が見つかったにもかかわらず、特別なハックが有効になっています。これらのハックは Git for Windows を利用する場合無効にする必要があります。\n詳細については、ヘルプファイルをキーワード \"Cygwin git\" または \"MSYS2 git\" で参照してください。" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." -msgstr "TortoiseGit のリベース処理が実行中であることを示すロックファイルが見つかりました。これはこの操作をブロックします。\n\nあなたが現在 TortoiseGit のリベース処理を実行していない場合、古いロックファイルを削除して、続行することができます。" +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +msgstr "TortoiseGit のリベース処理が実行中であることを示すロックファイルが見つかりました。これはこの操作をブロックします。\n\nあなたが現在 TortoiseGit のリベース処理を実行中でない場合、古いロックファイルを削除して、続行することができます。" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) msgid "" @@ -5289,42 +5326,6 @@ msgstr "統計情報収集中" msgid "General" msgstr "全般" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "全般::代替エディター" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "全般::色１" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "全般::色２" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "全般::色３" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "全般::コンテキストメニュー" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "全般::コンテキストメニュー2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "全般::ダイアログ1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "全般::ダイアログ2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "全般::ダイアログ3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "マージのログを取得する" @@ -5408,7 +5409,7 @@ msgstr "Git SVN DCommit" #. Resource IDs: (IDS_MENUSVNREBASE_DESC) msgid "Git SVN Rebase" -msgstr "Git SVNリベース(ローカルへ反映)" +msgstr "Git SVN リベース" #. Resource IDs: (Dialog IDD_SYNC: Control id 326) msgid "Git Synchronization" @@ -5453,14 +5454,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "Gitは、階層的な設定の概念を使用しています。\nすなわち、いくつかのレベルが有り、高いレベルの設定値は、低いレベルの設定値を上書きします。\n「実効値」では、現在のスコープで、結果的に使用される設定の値が表示され、これはリードオンリーです。\nローカル/グローバル/システムといったレベルを選択すると、そのレベルの設定値が表示されます。\n設定の値を変えるには、レベルを選び、値を設定し、どこに値を保存したいかを選択してください。" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "Git::資格情報" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "Git::リモート" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5638,14 +5631,6 @@ msgstr "ヒント：最近使用したコミットメッセージは、テキス msgid "Hook Scripts" msgstr "フックスクリプト" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "フックスクリプト::課題追跡システム管理設定" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "フックスクリプト::課題追跡システムとの統合" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "フックの種類" @@ -5917,12 +5902,8 @@ msgid "Icon Overlays" msgstr "アイコンオーバーレイ" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "アイコンオーバーレイ::アイコンセット" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "アイコンオーバーレイ::オーバーレイハンドラー" +msgid "Icon Set" +msgstr "アイコンセット" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6152,8 +6133,8 @@ msgid "Importing file %s" msgstr "%s をインポート" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" -msgstr "受け入れ変更リスト" +msgid "In Changelist" +msgstr "変更リストにて" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) msgid "In Commits" @@ -6225,8 +6206,8 @@ msgstr "クリップボードの内容を挿入する\n貼り付け" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." -msgstr "複製したリポジトリのHEADの代わりに、指定したブランチをHEADにします。" +"cloned repository's HEAD, point to specific branch instead." +msgstr "新しく作成された HEAD を、クローンされたリポジトリの HEAD が指すブランチを指すのではなく、特定のブランチを指すようにします。" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) msgid "" @@ -6250,6 +6231,14 @@ msgstr "無効な通貨です。" msgid "Invalid revision number!" msgstr "不正なリビジョン番号！" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "課題追跡システムの設定" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "課題追跡システムとの統合" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "Issuer:" @@ -6730,6 +6719,10 @@ msgstr "マージポイント" msgid "Merge Reintegrate" msgstr "マージの再統合" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "マージツール" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6901,10 +6894,6 @@ msgstr "入れ子" msgid "Network" msgstr "ネットワーク" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "ネットワーク::メール" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "新規" @@ -7091,7 +7080,7 @@ msgstr "それ以上リビジョンは見つかりませんでした。" msgid "" "No need to rebase\n" "\"%1!s!\" equals \"%2!s!\"" -msgstr "リベースする必要はありません\n\"%s\" と \"%s\" は同じです" +msgstr "リベースする必要はありません\n\"%1!s!\" と \"%2!s!\" は同じです" #. Resource IDs: (IDS_PROC_NOPREVIOUSVERSION) msgid "No previous version." @@ -7181,7 +7170,7 @@ msgstr "もしあなたが、自動保存されたドキュメントの復元を #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "注：これらの設定は、パッチビューアダイアログにも適用されます。\nビルトインの差分ビューアを使用するか、代わりの差分ビューアを使用するかを選択するには、左側のツリーの「差分ビューア」設定セクションを選択してください。" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7198,7 +7187,7 @@ msgstr "ノート" #. Resource IDs: (IDS_PROC_NOTHINGTOREBASE) msgid "Nothing to Rebase" -msgstr "リベースはありません" +msgstr "リベースするものがありません" #. Resource IDs: (IDS_ERROR_NOTHING_COMMIT) msgid "Nothing to commit" @@ -7498,7 +7487,7 @@ msgid "Others" msgstr "Others" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "送り出し変更リスト" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7517,6 +7506,10 @@ msgstr "出力ディレクトリー" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "オーバーレイハンドラー" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "上書き" @@ -7941,14 +7934,11 @@ msgid "Proxy Settings" msgstr "プロキシの設定" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "リモートに無いブランチを削除" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "リモートに無いブランチを削除 (すべてのリモート)" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "プル" @@ -7990,7 +7980,7 @@ msgstr "プッシュ" #. Resource IDs: (Dialog IDD_PUSH: Control id 1492) msgid "Push &option:" -msgstr "" +msgstr "プッシュオプション(&o):" #. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1786) msgid "Push Default" @@ -8190,14 +8180,18 @@ msgid "Ref List" msgstr "Refリスト" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" -msgstr "Refブラウザー" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" +msgstr "リファレンスブラウザー" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "RefLog" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "リファレンスブラウザー" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "コミットを含む参照" @@ -8274,7 +8268,8 @@ msgstr "選択を記憶する(\"svn.rmdir\" オプションで)" msgid "Reminder: Commit your change after resolve" msgstr "注意: 競合を解決したらコミットして下さい" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "リモート" @@ -8797,8 +8792,8 @@ msgid "Sa&feCrLf:" msgstr "SafeCrLf(&F):" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "SafeCrLf:" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9260,8 +9255,8 @@ msgid "Show" msgstr "表示" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" -msgstr "Reflogを表示(&R)" +msgid "Show &RefLog" +msgstr "RefLogを表示(&R)" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, #. IDS_PROC_LOG_SHOWUNVERSIONED) @@ -9433,7 +9428,7 @@ msgid "Show la&beled commits only" msgstr "ラベルの付いたコミットのみ(&B)" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" +msgid "Show line number&s" msgstr "行番号を表示する(&S)" #. Resource IDs: (IDS_MENULFSLOCKS) @@ -10254,6 +10249,10 @@ msgstr "ファイルが大きすぎます" msgid "The file is too large to open." msgstr "ファイルが大きすぎて開けません。" +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "ファイルが変更されています。変更を保存しますか？" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10757,12 +10756,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "TortoiseGitBlame\n\nTortoiseGitBlame\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10883,7 +10882,7 @@ msgid "Trim right" msgstr "行末の空白を削除" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "自動的な解決のために外部マージツールの終了コードを信頼する" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11132,8 +11131,8 @@ msgid "Use .mailmap" msgstr ".mailmap を使用" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" -msgstr "Git LFS を使用" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" +msgstr "Git LFS を使用 (Git 2.15 未満と Git LFS 2.3 未満のみ必要)" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) msgid "Use HTTP path component" @@ -11717,6 +11716,11 @@ msgstr "最新バージョンがインストールされています。" msgid "You asked to pull, but did not specify a remote branch." msgstr "プルが要求されましたが、リモートブランチが設定されていません" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "全てのリモートまたはグローバルに対する設定は、Git設定ページから可能です。" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" @@ -12136,15 +12140,15 @@ msgstr "manager - このレポジトリのみ" #. Resource IDs: (IDS_SYSTEM_GCMCORE) msgid "manager-core - all Windows users" -msgstr "" +msgstr "manager-core - 全てのWindowsユーザー" #. Resource IDs: (IDS_GLOBAL_GCMCORE) msgid "manager-core - current Windows user" -msgstr "" +msgstr "manager-core - 現在のWindowsユーザー" #. Resource IDs: (IDS_LOCAL_GCMCORE) msgid "manager-core - this repository only" -msgstr "" +msgstr "manager-core - このレポジトリのみ" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1494) msgid "master" diff --git a/Languages/Tortoise_ko.po b/Languages/Tortoise_ko.po index f61033f8c..d188a58b2 100644 --- a/Languages/Tortoise_ko.po +++ b/Languages/Tortoise_ko.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -10,6 +10,7 @@ # Ian Yoon , 2012 # jeiea , 2013 # Jinbaek Lee , 2016 +# Juhee Park , 2020 # 오준일 , 2018 # Kim KiHyeon , 2011 # kim minhyouk , 2015 @@ -21,6 +22,7 @@ # 이피시소리 , 2014 # 이피시소리 , 2014 # Sangjun Jung , 2011 +# sr , 2020 # Sven Strickroth , 2020 # TaeDong Kim , 2011,2013,2016 # yang , 2013 @@ -32,7 +34,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Korean (http://www.transifex.com/lznuaa/tortoisegit/language/ko/)\n" "MIME-Version: 1.0\n" @@ -335,13 +337,13 @@ msgstr "&3 way merge" #. Resource IDs: (IDS_MSGBOX_ABORT) msgid "&Abort" -msgstr "중단(&A)" +msgstr "중단" #. Resource IDs: (IDS_HOOKFAILED_TASK3) msgid "" "&Abort\n" "You can fix the reason the hook script failed first." -msgstr "" +msgstr "중단\n훅 스크립트가 실패한 이유를 고칠 수 있습니다." #. Resource IDs: (ID_APP_ABOUT - Menu) msgid "&About TortoiseGitBlame..." @@ -477,7 +479,7 @@ msgstr "커밋(&C)" #. Resource IDs: (IDS_MENUCOMMITSUBMODULE) msgid "&Commit submodule..." -msgstr "&Commit submodule..." +msgstr "서브모듈 커밋(&C)..." #. Resource IDs: (IDS_PROC_COMMIT_NOADDSIGNOFFBUTTON) msgid "&Commit w/o" @@ -494,7 +496,7 @@ msgstr "리비전 비교(&C)" #. Resource IDs: (IDS_LOG_POPUP_COMPAREWITHPREVIOUS) msgid "&Compare with previous revision" -msgstr "" +msgstr "이전 리비전과 비교" #. Resource IDs: (IDS_WALKBEHAVIOUR_COMPRESSED) msgid "&Compressed Graph" @@ -516,7 +518,7 @@ msgstr "복사(&C)\tCtrl+C" #. Resource IDs: (Dialog IDD_FIRSTSTARTWIZARD_AUTHENTICATION: Control id #. 65535) msgid "&Credential helper:" -msgstr "" +msgstr "자격 증명 도움말:" #. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 1662) msgid "&Custom" @@ -524,7 +526,7 @@ msgstr "사용자 지정(&C)" #. Resource IDs: (ID_VIEW_DARKMODE - Menu) msgid "&Dark Mode" -msgstr "" +msgstr "다크 모드" #. Resource IDs: (ID_VIEW_DARKMODE - Menu) msgid "&Dark Mode\tD" @@ -553,7 +555,7 @@ msgstr "" #. Resource IDs: (IDS_DELETE_BRANCHTAG) msgid "&Delete branch/tag" -msgstr "" +msgstr "브랜치/태그 삭제(&D)" #. Resource IDs: (65535 - PopupMenu) msgid "&Detect moved or copied lines" @@ -595,7 +597,7 @@ msgstr "다시 묻지 않음(&D)" msgid "" "&Don't run\n" "Do not run the script" -msgstr "" +msgstr "실행하지 않음\n이 스크립트를 실행하지 않음" #. Resource IDs: (IDS_MSGBOX_DONOTSHOWAGAIN) msgid "&Don't show this message again" @@ -604,7 +606,7 @@ msgstr "이 메시지를 다시 표시하지 않음(&D)" #. 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 "현재 설정을 저장하지 않음" #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1384) msgid "&Down" @@ -655,7 +657,7 @@ msgstr "메일(&E):" #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQADV: Control id 1023, Dialog #. IDD_SETTINGSHOOKCONFIG: Control id 1023) msgid "&Enable" -msgstr "" +msgstr "활성화(&E)" #. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 1023) msgid "&Enable Proxy Server" @@ -685,7 +687,7 @@ msgstr "다른 프로그램(&E)" #. Resource IDs: (Dialog IDD_FIRSTSTARTWIZARD_GIT: Control id 65535, Dialog #. IDD_SETTINGSMAIN: Control id 65535) msgid "&Extra PATH:" -msgstr "" +msgstr "다른 경로:" #. Resource IDs: (65535 - PopupMenu) msgid "&File" @@ -750,7 +752,7 @@ msgstr "" #. Resource IDs: (65535 - PopupMenu) msgid "&Git" -msgstr "" +msgstr "&Git" #. Resource IDs: (Dialog IDD_SVNDCOMMITTYPE: Control id 2153) msgid "&Git Style Commit (--rmdir)" @@ -1045,7 +1047,7 @@ msgstr "포트(&P):" #. Resource IDs: (Dialog IDD_REBASE: Control id 1608) msgid "&Preserve merges" -msgstr "" +msgstr "병합 방지" #. Resource IDs: (Dialog AFX_IDD_PREVIEW_TOOLBAR: Control id 58116) msgid "&Print..." @@ -1063,7 +1065,7 @@ msgstr "계속(&P)" msgid "" "&Proceed anyway\n" "Ignore the hook script and run the command anyway." -msgstr "" +msgstr "어쨌든 계속(&P)\n훅 스크립트를 무시하고 명령을 실행한다." #. Resource IDs: (IDS_PROC_SYNC_PULL) msgid "&Pull" @@ -1163,17 +1165,17 @@ msgstr "재시도(&R)" #. Resource IDs: (IDS_LOG_POPUP_REVERTREV) msgid "&Revert change by this commit" -msgstr "이 커밋 변경을 취소(&R)" +msgstr "이 커밋 변경을 되돌리기(&R)" #. Resource IDs: (IDS_LOG_POPUP_REVERTREVS) msgid "&Revert changes by these commits" -msgstr "이 커밋 변경들을 취소(&R)" +msgstr "이 커밋 변경들을 되돌리기(&R)" #. Resource IDs: (IDS_HOOKS_APPROVE_TASK3) msgid "" "&Run\n" "Run the hook script" -msgstr "" +msgstr "실행\n훅 스크립트를 실행하기" #. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 65535) msgid "&SSH client:" @@ -1203,7 +1205,7 @@ msgstr "저장(&S)\tCtrl+S" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1687) msgid "&Search..." -msgstr "" +msgstr "검색" #. Resource IDs: (IDS_PROC_SETMSYSGITPATH) msgid "&Set Git path" @@ -1252,7 +1254,7 @@ msgstr "임시 보관(&S)" #. Resource IDs: (ID_VIEW_STATUS_BAR - Menu) msgid "&Status Bar" -msgstr "&Status Bar" +msgstr "상태 바(&S)" #. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 1849) msgid "&Store credentials..." @@ -1374,7 +1376,7 @@ msgstr "보기(&V)" #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1851) msgid "&View effective config" -msgstr "" +msgstr "효과적인 config 보기" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 65535) msgid "&Warn on missing Signed-Off-By on commit" @@ -1570,7 +1572,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 "아이콘 오버레이를 표시할 경로 목록을 개행문자로 구별합니다.\n각 경로 끝에 '?' 문자를 추가하면 해당 경로만 포함됩니다.\n한 경로의 끝에 '*' 을 붙이거나 아무 문자도 추가하지 않으면 해당 경로의 모든 파일과 하위 폴더도 모두 포함됩니다." #. Resource IDs: (IDS_SETTINGS_EXCLUDECONTEXTLIST_TT) msgid "" @@ -1585,7 +1587,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 "아이콘 오버레이를 표시하지 않을 경로 목록을 개행문자로 구별합니다.\n각 경로 끝에 '?' 문자를 추가하면 해당 경로만 제외됩니다.\n한 경로의 끝에 '*' 을 붙이거나 아무 문자도 추가하지 않으면 해당 경로의 모든 파일과 하위 폴더도 모두 제외됩니다.\n목록을 비워둘 경우 모든 경로에서 오버레이를 허용합니다." #. Resource IDs: (AFX_IDS_RESOURCE_EXCEPTION) msgid "A required resource was unavailable." @@ -1625,7 +1627,7 @@ msgstr "파일 이름 바꾼 로그 줄이기" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 65535) msgid "Abbreviated size" -msgstr "" +msgstr "축약된 크기" #. Resource IDs: (Dialog IDD_GITPROGRESS: Control id 2, Dialog IDD_REBASE: #. Control id 1565, Dialog IDD_RESOLVE_CONFLICT: Control id 2) @@ -1646,7 +1648,7 @@ msgstr "Aborts a running merge." #. Resource IDs: (cmdAbout_LabelTitle_RESID) msgid "Abou&t TortoiseGitMerge" -msgstr "" +msgstr "Abou&t TortoiseGitMerge" #. Resource IDs: (Dialog IDD_ABOUT: Control id 129) msgid "About TortoiseGit" @@ -1662,7 +1664,7 @@ msgstr "TortoiseGitMerge 정보" #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 1) msgid "Accept certificate" -msgstr "" +msgstr "자격 승인" #. Resource IDs: (AFX_IDP_FILE_ACCESS_DENIED) #, c-format @@ -1720,11 +1722,11 @@ msgstr "다른 커밋을 추가합니까?" #. Resource IDs: (IDS_STATUSLIST_CONTEXT_ADD_EXE) msgid "Add as Executable (+x)" -msgstr "" +msgstr "실행파일로 추가 (+x)" #. Resource IDs: (IDS_STATUSLIST_CONTEXT_ADD_LINK) msgid "Add as Symlink" -msgstr "" +msgstr "심볼릭 링크를 추가하세요." #. Resource IDs: (IDS_DLGTITLE_ADD_DIFF_TOOL) msgid "Add extension specific diff program" @@ -1828,7 +1830,7 @@ msgstr "모든 로컬 브랜치" msgid "" "All or some options are limited. In order to change all these settings, you " "need Administrator rights." -msgstr "" +msgstr "전부 또는 일부의 옵션이 제한됩니다. 모든 이런 설정을 바꾸기 위해 Administrator 권리가 필요합니다." #. Resource IDs: (IDS_ALLREFS) msgid "All refs" @@ -1862,6 +1864,10 @@ msgstr "" msgid "Already up to date." msgstr "이미 최신입니다." +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "Always push to the selected remote archive for this local branch" @@ -1932,11 +1938,11 @@ msgstr "%1에 접근 중에 알 수 없는 오류가 발생했습니다." #. Resource IDs: (IDS_ERR_PATCH_UNKNOWNLINETYPE) #, c-format msgid "An unknown line type was found in line %d!" -msgstr "" +msgstr "알 수 없는 라인 유형이 발견되었습니다. 라인번호 %d !" #. Resource IDs: (IDS_ANNOTATEDTAGS) msgid "Annotated tags" -msgstr "" +msgstr "주석이 달린 태그" #. Resource IDs: (IDS_VIEWCONTEXTMENU_APPENDRIGHT) msgid "Append right block" @@ -1972,7 +1978,7 @@ msgstr "Unified Diff 적용" #. Resource IDs: (IDS_HOOKS_APPROVE_TASK2) msgid "Approve or reject client-side hook script" -msgstr "" +msgstr "클라이언트 측 훅 스크립트를 승인 또는 거절" #. Resource IDs: (65535 - PopupMenu) msgid "Arabic" @@ -1993,7 +1999,7 @@ msgstr "재배치를 정말 중단하겠습니까?" #. Resource IDs: (IDS_REALLYCANCEL) msgid "Are you sure you want to cancel?" -msgstr "" +msgstr "정말 취소하시겠습니까?" #. Resource IDs: (IDS_PROC_RESOLVE) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" @@ -2004,7 +2010,7 @@ msgstr "충돌한 파일들을 해결되었음으로 처리하는 것이 확실 msgid "" "Are you sure you want to revert %d item(s)? You will lose ALL changes since " "the last update!" -msgstr "" +msgstr "정말 %d개 항목을 되돌리겠습니까? 마지막 업데이트 이후의 모든 변경사항이 사라집니다!" #. Resource IDs: (IDS_WARNUSERSAFEDIFFERENT) #, c-format @@ -2087,7 +2093,7 @@ msgstr "인증" #. Resource IDs: (IDS_FIRSTSTART_AUTHENTICATIONTITLE) msgid "Authentication and credential store" -msgstr "" +msgstr "인증 및 자격 저장소 " #. Resource IDs: (Dialog IDD_SETTINGSSAVEDDATA: Control id 1278) msgid "Authentication data" @@ -2103,15 +2109,15 @@ msgstr "작성자 이메일" #. Resource IDs: (IDS_LOG_POPUP_CLIPBOARD_AUTHORSEMAIL) msgid "Author email addresses" -msgstr "" +msgstr "작성자 이메일 주소" #. Resource IDs: (IDS_LOG_POPUP_CLIPBOARD_AUTHORSNAME) msgid "Author names" -msgstr "" +msgstr "작성자 이름" #. Resource IDs: (Dialog IDD_ABOUT: Control id 65535) msgid "Author:\t\t\tStefan Kueng" -msgstr "" +msgstr "작성자:\t\t\t\tStefan Kueng" #. Resource IDs: (IDS_LOG_FILTER_AUTHORS) msgid "Authors" @@ -2129,13 +2135,9 @@ msgstr "작성자 대소문자 구별함" msgid "Auto CrLf convert" msgstr "자동 CR/LF 변환" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" -msgstr "" +msgstr "Auto&CrLf:" #. Resource IDs: (IDS_PROGRS_CLOSE_NOCONFLICTS) msgid "Auto-close if no conflicts" @@ -2159,6 +2161,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "로그 메시지를 작성하는 중에 수정된 파일에서 단어를 찾아\n자동완성합니다. (클래스명이나 멤버 이름에서)" +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "자동으로 Putty 키 불러오기(&K)" @@ -2204,7 +2210,7 @@ msgstr "막대 그래프" #. Resource IDs: (Dialog IDD_RESOLVESUBMODULECONFLICT: Control id 1385, #. IDS_PROC_DIFF_BASE) msgid "Base" -msgstr "" +msgstr "기준" #. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1522) msgid "Base On" @@ -2244,7 +2250,7 @@ msgstr "Bisect reset" #. Resource IDs: (IDS_MENUBISECTSKIP) msgid "Bisect skip" -msgstr "" +msgstr "이분검색 생략" #. Resource IDs: (Dialog IDD_BISECTSTART: Control id 4574, #. IDS_MENUBISECTSTART) @@ -2280,7 +2286,7 @@ msgstr "알파 혼합" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1852) msgid "Block TortoiseGit while executing the external merge tool" -msgstr "" +msgstr "외부 병합 툴을 실행하는 동안 TortoiseGit 블럭" #. Resource IDs: (cmdGroupBlocks_LabelTitle_RESID) msgid "Blocks" @@ -2329,7 +2335,7 @@ msgstr "브랜치 이름" #. Resource IDs: (IDS_REV_COUNTER) msgid "Branch RevNo" -msgstr "" +msgstr "브랜치 리비전 번호" #. Resource IDs: (IDS_REBASE_FASTFORWARD_FMT) #, c-format @@ -2412,7 +2418,7 @@ msgstr "" #. 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 @@ -2426,7 +2432,7 @@ msgstr "커밋(&o)" #. Resource IDs: (IDS_LOG_POPUP_COMMIT) msgid "C&ommit..." -msgstr "" +msgstr "커밋(&o)" #. Resource IDs: (IDS_LOG_POPUP_COPY) msgid "C&reate branch/tag from revision" @@ -2468,7 +2474,7 @@ msgid "" "%1!s!\n" "to\n" "%2!s!" -msgstr "" +msgstr "%1!s!를 %2!s!로 복사할 수 없습니다. " #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 2, Dialog #. AFX_IDD_PRINTDLG: Control id 2, Dialog IDD_ADD: Control id 2, Dialog @@ -2545,7 +2551,7 @@ msgstr "Cancel\nStay with current settings" msgid "" "Cannot combine commits now.\n" "Make sure you are viewing the log of your current branch and no filters are applied." -msgstr "" +msgstr "커밋을 지금 결합할 수 없습니다. \n현재 브랜치의 로그를 보고 있고 필터가 적용되지 않았는지 확인하세요." #. Resource IDs: (IDS_B_CANNOTFORCECURRENT) msgid "" @@ -2576,7 +2582,7 @@ msgstr "중부 유럽" #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Certificate verification failed!" -msgstr "" +msgstr "인증서 검증 실패" #. Resource IDs: (Dialog IDD_CHECKFORUPDATES: Control id 1697) msgid "Change log" @@ -2613,12 +2619,12 @@ msgstr "변경된 파일" #. Resource IDs: (IDS_FILEDIFF_CHANGEDLISTINTROROOT) #, c-format msgid "Changed files between %1!s! and %2!s!" -msgstr "" +msgstr "%1!s! 및 %2!s! 사이에 변경된 파일" #. Resource IDs: (IDS_FILEDIFF_CHANGEDLISTINTRO) #, c-format msgid "Changed files between %1!s!, %2!s! and %3!s!, %4!s!" -msgstr "" +msgstr " %1!s!, %2!s!과 %3!s!, %4!s! 사이에 변경된 파일" #. Resource IDs: (IDS_CHECKUPDATE_SUMMARY) #, c-format @@ -2688,7 +2694,7 @@ msgstr "TortoiseGit 하위 메뉴가 아닌 최상위 컨텍스트 메뉴에서 msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + right click)" -msgstr "" +msgstr "확장 컨텍스트 메뉴(시프트+우클릭)에서 볼 항목을 체크하세요" #. Resource IDs: (IDS_SETTINGS_RELATIVETIMES_TT) msgid "Check to show relative times in log messages" @@ -2706,7 +2712,7 @@ msgstr "체크:" msgid "" "Checked items will be hidden in the context menu by default and will only be" " visible if the shift key is pressed while opening the context menu." -msgstr "" +msgstr "확인된 아이템들은 기본적으로 숨겨지고 컨텍스트 메뉴가 열려있는 동안 쉬프트 키가 눌렸을 때에 보일 것 입니다." #. Resource IDs: (IDS_PROGRS_CMD_CHECKOUT, IDS_PROGRS_TITLE_CHECKOUT) msgid "Checkout" @@ -2736,7 +2742,7 @@ msgstr "Cherry Pick failed" msgid "" "Cherry-pick failed (please see log in the cherry pick/rebase dialog for " "details)! Skip this commit?" -msgstr "" +msgstr "Cherry-pick 실패(자세한 내용은 Cherry chick/rebase 대화 상자의 로그를 참조하십시오.)! 현재 커밋을 생략하시겠습니까?" #. Resource IDs: (65535 - PopupMenu) msgid "Chinese" @@ -2882,7 +2888,7 @@ msgstr "기본 저장소로 복제" #. Resource IDs: (IDS_CLONE_BARE_REPO_TT) msgid "Clone into a git repository without the working tree." -msgstr "" +msgstr "워킹 트리 없이 깃 저장소로 복제" #. Resource IDs: (IDS_MENUCLONE) msgid "Clone..." @@ -2901,13 +2907,13 @@ msgstr "수동으로 닫습니다." msgid "" "Close print preview mode\n" "Cancel Preview" -msgstr "Close print preview mode\nCancel Preview" +msgstr "프린트 미리보기 모드 종료\n미리보기 닫기" #. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" -msgstr "Close the active document\nClose" +msgstr "활성화된 문서 닫기\n닫기" #. Resource IDs: (AFX_IDS_SCCLOSE) msgid "Close the active window and prompts to save the documents" @@ -2933,10 +2939,22 @@ msgstr "Color by age, &continuous" msgid "Colors" msgstr "색상" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" -msgstr "" +msgstr "열: %d" #. Resource IDs: (IDS_COMBINE_TO_ONE) msgid "Com&bine to one commit" @@ -3079,7 +3097,7 @@ msgstr "Compare selected refs" #. Resource IDs: (IDS_PROC_SYNC_COMPARETAGS) msgid "Compare tags" -msgstr "" +msgstr "태그 비교" #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COMPARETWOFILES) msgid "Compare two files" @@ -3156,11 +3174,11 @@ msgstr "대체 편집기를 지정합니다. *nix계열의 줄바꿈 문자를 #. Resource IDs: (IDS_CONFIGUREDEFAULT) msgid "Configure default" -msgstr "" +msgstr "기본값 설정" #. Resource IDs: (IDS_FIRSTSTART_GITTITLE) msgid "Configure git.exe" -msgstr "" +msgstr "git.exe 파일 설정" #. Resource IDs: (Dialog IDD_SETTINGSPROGSDIFF: Control id 65535) msgid "Configure the program used for comparing different revisions of files" @@ -3172,7 +3190,7 @@ msgstr "충돌한 파일을 해결하는 프로그램을 설정합니다." #. Resource IDs: (IDS_FIRSTSTART_USERTITLE) msgid "Configure user information" -msgstr "" +msgstr "사용자 정보 설정" #. Resource IDs: (Dialog IDD_SETTINGSPROGSDIFF: Control id 65535) msgid "Configure viewer program for GNU diff files (patch files)" @@ -3209,6 +3227,14 @@ msgstr "Conflicts" msgid "Conflicts: %d" msgstr "충돌: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "패치를 위한 문맥 행" @@ -3306,7 +3332,7 @@ msgstr "새 버전을 확인할 수 없습니다!" #. Resource IDs: (IDS_CHECKNEWER_NETERROR_FORMAT) #, c-format msgid "Could not check for a newer version! %1!s! (Error code: 0x%2!08X!)" -msgstr "" +msgstr "새 버전을 확인할 수 없음! %1!s! (오류 코드: 0x%2!08X!)" #. Resource IDs: (IDS_ERR_COPYFILES) #, c-format @@ -3331,9 +3357,9 @@ msgstr "Could not find Super-project" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3461,7 +3487,7 @@ msgstr "개수: %u 일치." #. Resource IDs: (IDS_MENUBRANCH) msgid "Create &Branch..." -msgstr "" +msgstr "브랜치 생성(&B)" #. Resource IDs: (Dialog IDD_SETTINGSMAIN: Control id 1683) msgid "Create &Library" @@ -3469,7 +3495,7 @@ msgstr "라이브러리 생성(&L)" #. Resource IDs: (Dialog IDD_GITSWITCH: Control id 1527) msgid "Create &New Branch" -msgstr "" +msgstr "새 브랜치 생성(&N)" #. Resource IDs: (IDS_CREATE_TAG_AT_THIS) msgid "Create &Tag at this version..." @@ -3477,11 +3503,11 @@ msgstr "" #. Resource IDs: (IDS_MENUTAG) msgid "Create &Tag..." -msgstr "" +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" @@ -3489,7 +3515,7 @@ msgstr "Create .gitignore file" #. Resource IDs: (IDS_CREATE_BRANCH_AT_THIS) msgid "Create Br&anch at this version..." -msgstr "" +msgstr "이 버전을 기준으로 브랜치 만들기(&a)..." #. Resource IDs: (IDS_PROGS_TITLE_CREATEBRANCH) msgid "Create Branch" @@ -3564,6 +3590,10 @@ msgstr "바뀐 모든 부분에 대해 Unified diff를 생성합니다" msgid "Creating pull-request..." msgstr "Creating pull-request..." +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "자격 증명 도우미는 빈 칸일 수 없습니다." @@ -3593,7 +3623,7 @@ msgstr "현재 브랜치:" msgid "" "Current HEAD is detached, you are working on (no branch).\n" "Do you want to create a branch now?" -msgstr "" +msgstr "현재 헤드는 분리되었습니다. 당신은 브랜치가 없는 상태로 작업중입니다.\n브랜치를 생성하시겠습니까?" #. Resource IDs: (IDS_REBASE_UPTODATE_FMT) #, c-format @@ -3642,13 +3672,13 @@ msgstr "공개하기" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 1699) msgid "Dark theme" -msgstr "" +msgstr "다크 테마" #. Resource IDs: (IDS_DARKTHEME_TT) msgid "" "Dark theme requires at least Win10 1803, and it must be enabled in the " "Windows system settings." -msgstr "" +msgstr "다크 테마는 최소한 윈도우10 1803 이상부터 사용 가능합니다. 윈도우 시스템 설정에서 활성화 시켜야 사용할 수 있습니다." #. Resource IDs: (IDS_LOG_DATE, IDS_STATUSLIST_COLDATE) msgid "Date" @@ -3664,7 +3694,7 @@ msgstr "기본" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 65535) msgid "Default limitation of log messages:" -msgstr "" +msgstr "로그 메시지 제약사항 기본값" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1064) msgid "Default to UTF-8 encoding" @@ -3729,7 +3759,7 @@ msgstr "브랜치 제거" #. Resource IDs: (IDS_DELETE_LOCALTAG) msgid "Delete local tag" -msgstr "" +msgstr "지역 태그 삭제" #. Resource IDs: (IDS_PROC_BROWSEREFS_DELETEREMOTEBRANCH) msgid "Delete remote branch" @@ -3758,7 +3788,7 @@ msgstr "꼬리표 제거" #. Resource IDs: (IDS_DELETE_REMOTETAG) msgid "Delete tag on remote" -msgstr "" +msgstr "원격 태그 삭제" #. Resource IDs: (IDS_B_DELETEORDIFFERENTNAME) msgid "Delete the existing branch or use a different name." @@ -3766,7 +3796,7 @@ msgstr "Delete the existing branch or use a different name." #. Resource IDs: (Dialog IDD_RESOLVE_CONFLICT: Control id 4570) msgid "Delete/modify merge conflict" -msgstr "" +msgstr "병합 충돌 삭제/변경" #. Resource IDs: (IDS_DELETEWHENEMPTY_TASK3) msgid "" @@ -3882,6 +3912,18 @@ msgstr "대화상자의 크기와 위치" msgid "Dialogs" msgstr "대화상자" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "비교" @@ -3898,10 +3940,6 @@ msgstr "두 커밋 비교하기" msgid "Diff Viewer" msgstr "수정사항(Diff) 뷰어" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "수정사항(Diff) 뷰어::병합 도구" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Diff 추가된 라인들" @@ -4244,7 +4282,7 @@ msgstr "다운로드" #. Resource IDs: (Dialog IDD_FIRSTSTARTWIZARD_LANGUAGE: Control id 65535) msgid "Download language packs:" -msgstr "" +msgstr "언어 팩 다운로드:" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 1073) msgid "Draw tag/branch labels on right side" @@ -4277,7 +4315,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" @@ -4391,7 +4429,7 @@ msgstr "결과" msgid "Either the name or IP of the proxy server" msgstr "프록시 서버 이름이나 IP를 입력하십시오." -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "이메일" @@ -4688,7 +4726,7 @@ msgstr "외부 프로그램:" #. Resource IDs: (cmdFind_Keytip_RESID) msgid "F" -msgstr "" +msgstr "F" #. Resource IDs: (IDS_MENUFETCH) msgid "F&etch..." @@ -5165,15 +5203,15 @@ msgstr "%d 앞으로" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5241,7 +5279,7 @@ msgstr "대화상자 3에 커밋 대화상자 옵션이 더 있습니다." #. Resource IDs: (cmdGotoLine_Keytip_RESID) msgid "G" -msgstr "" +msgstr "G" #. Resource IDs: (IDS_VIEW_SHOWGRAVATAR) msgid "G&ravatar" @@ -5277,42 +5315,6 @@ msgstr "통계 생성 중" msgid "General" msgstr "일반" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "일반::대체 편집기" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "일반::색상 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "일반::색상 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "일반::색상 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "일반::컨텍스트 메뉴" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "일반::컨텍스트 메뉴 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "일반::대화상자 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "일반::대화상자 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "일반::대화상자 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "병합 로그 보기" @@ -5441,14 +5443,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "깃은 계층적 설정 개념을 사용합니다.\n즉, 여러 설정 단계가 있고, 높은 단계의 설정은 낮은 단계의 설정을 덮어씁니다.\n\"결과\" 탭은 현재 범위에 적용된 설정을 보여줍니다. (수정할 수 없습니다)\n어떤 단계의 설정을 보고 싶으면 그 단계를 선택하세요.\n설정을 바꾸려면 단계를 선택하고, 값을 입력한 다음 어디에 저장할지 선택하세요." -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "Git::자격 증명" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "Git::원격" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5626,14 +5620,6 @@ msgstr "" msgid "Hook Scripts" msgstr "훅 스크립트" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "훅 스크립트::이슈 트래커 설정" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "훅 스크립트::이슈 트래커 통합" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "훅 종류" @@ -5668,7 +5654,7 @@ msgstr "ID:220:V C +G" #. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" -msgstr "" +msgstr "ID:32771:V C +W" #. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" @@ -5680,11 +5666,11 @@ msgstr "ID:32773:V C +O" #. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" -msgstr "" +msgstr "ID:32773:V CS+S" #. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" -msgstr "" +msgstr "ID:32774:V C +O" #. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" @@ -5697,7 +5683,7 @@ msgstr "ID:32775:V C +D" #. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" -msgstr "" +msgstr "ID:32776:V C +S" #. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" @@ -5709,20 +5695,20 @@ msgstr "ID:32779:V +S" #. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" -msgstr "" +msgstr "ID:32782:V C +P" #. Accelerator Entry for Menu ID:32787; '' #. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" -msgstr "" +msgstr "ID:32787:V C +F" #. Accelerator Entry for Menu ID:32789; '' msgid "ID:32789:VA +N" -msgstr "" +msgstr "ID:32789:VA +N" #. Accelerator Entry for Menu ID:32790; '' msgid "ID:32790:VA +P" -msgstr "" +msgstr "ID:32790:VA +P" #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" @@ -5746,7 +5732,7 @@ msgstr "ID:32818:V +H" #. Accelerator Entry for Menu ID:32819; '&Dark Mode\tD' msgid "ID:32819:V +D" -msgstr "" +msgstr "ID:32819:V +D" #. Accelerator Entry for Menu ID:32822; '' msgid "ID:32822:V C +F" @@ -5774,7 +5760,7 @@ msgstr "ID:32870:V C +L" #. Accelerator Entry for Menu ID:32873; '' msgid "ID:32873:V C +E" -msgstr "" +msgstr "ID:32873:V C +E" #. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" @@ -5905,12 +5891,8 @@ msgid "Icon Overlays" msgstr "아이콘 오버레이" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "아이콘 오버레이::아이콘 모음" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "아이콘 오버레이::아이콘 핸들" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6140,8 +6122,8 @@ msgid "Importing file %s" msgstr "Importing file %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" -msgstr "In ChangeList" +msgid "In Changelist" +msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) msgid "In Commits" @@ -6213,7 +6195,7 @@ msgstr "클립보드 내용을 붙임\n붙여넣기" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6238,6 +6220,14 @@ msgstr "유효하지 않은 단위" msgid "Invalid revision number!" msgstr "Invalid revision number!" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6303,11 +6293,11 @@ msgstr "한국어" #. Resource IDs: (cmdViewWrapLines_Keytip_RESID) msgid "L" -msgstr "" +msgstr "L" #. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) msgid "LFS" -msgstr "" +msgstr "LFS" #. Resource IDs: (IDS_PROGRS_TITLE_LFS_LOCK) msgid "LFS Lock" @@ -6718,11 +6708,15 @@ msgstr "Merge Point" msgid "Merge Reintegrate" msgstr "재통합 병합" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" -msgstr "" +msgstr "기존 브랜치, 작업 트릐 내용 및 전환할 브랜치를 병합하십시오." #. Resource IDs: (IDS_PATHACTIONS_MERGED, IDS_SVNACTION_MERGED, #. IDS_VIEWTITLE_MERGED) @@ -6889,10 +6883,6 @@ msgstr "중첩됨" msgid "Network" msgstr "네트워크" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "네트워크::이메일" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "New" @@ -7169,7 +7159,7 @@ msgstr "자동으로 저장된 문서를 복구하는 것을 선택했다면, #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7486,8 +7476,8 @@ msgid "Others" msgstr "기타" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" -msgstr "보낼 변경사항" +msgid "Out Changelist" +msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) msgid "Out Commits" @@ -7505,6 +7495,10 @@ msgstr "저장할 폴더" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "덮어쓰기" @@ -7929,14 +7923,11 @@ msgid "Proxy Settings" msgstr "프록시 설정" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "제거" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "제거 (모두 원격)" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "가져와 병합하기" @@ -8026,7 +8017,7 @@ msgstr "인용 경로" #. Resource IDs: (cmdReload_Keytip_RESID) msgid "R" -msgstr "" +msgstr "R" #. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1073) msgid "R&AM drives" @@ -8178,14 +8169,18 @@ msgid "Ref List" msgstr "참조 목록" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" -msgstr "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" +msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "참조 기록" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8262,7 +8257,8 @@ msgstr "Remember selection (\"svn.rmdir\" option)" msgid "Reminder: Commit your change after resolve" msgstr "주의: 충돌을 해결한 후에 커밋해주세요" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "원격" @@ -8576,7 +8572,7 @@ msgstr "Revert commit" #. Resource IDs: (IDS_PROC_REVERTCOMMIT) #, c-format msgid "Revert commit %s" -msgstr "Revert commit %s" +msgstr " %s 커밋 되돌리기" #. Resource IDs: (IDS_REVERTCOMMITS) msgid "Revert the selected commit(s)?" @@ -8589,7 +8585,7 @@ msgstr "Revert to parent revision" #. Resource IDs: (IDS_FILEDIFF_POPREVERTTOREV) #, c-format msgid "Revert to revision %s" -msgstr "Revert to revision %s" +msgstr " %s리비전으로 되돌리기" #. Resource IDs: (IDS_SVNACTION_REVERT) msgid "Reverted" @@ -8696,7 +8692,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) @@ -8785,8 +8781,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9248,8 +9244,8 @@ msgid "Show" msgstr "보기" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" -msgstr "참조 기록 보기(&R)" +msgid "Show &RefLog" +msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, #. IDS_PROC_LOG_SHOWUNVERSIONED) @@ -9421,8 +9417,8 @@ msgid "Show la&beled commits only" msgstr "이름이 붙은 커밋만 보기(&B)" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "줄 번호 보기(&S)" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10079,7 +10075,7 @@ msgstr "꼬리표 정보" #. Resource IDs: (IDS_LOG_POPUP_CLIPBOARD_TAGBRANCHES) msgid "Tag/branch names" -msgstr "" +msgstr "태그/브랜치 이름" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1485) msgid "Tags" @@ -10242,6 +10238,10 @@ msgstr "너무 커서 열 수 없습니다." msgid "The file is too large to open." msgstr "너무 커서 열 수 없습니다." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10745,12 +10745,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10871,7 +10871,7 @@ msgid "Trim right" msgstr "Trim right" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -10953,7 +10953,7 @@ msgid "" "This can happen if the file has been renamed.\n" "Please start the log dialog on this specific file alone and then revert the changes\n" "from the top pane in the log dialog." -msgstr "Unable to reconstruct working tree path!\nThis can happen if the file has been renamed.\nPlease start the log dialog on this specific file alone and then revert the changes\nfrom the top pane in the log dialog." +msgstr "작업 트리 경로를 재구성할 수 없습니다!\n파일 이름이 변경된 경우에 생길 수 있는 문제입니다.\n이 파일에 대한 로그 대화창을 실행해서 변경 내역을\n로그 대화창 최상단 영역의 변경 내역을 되돌리세요." #. Resource IDs: (IDS_ERR_CHANGELIST_SAVE) msgid "Unable to save changelists" @@ -11120,7 +11120,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11376,7 +11376,7 @@ msgstr "" #. Resource IDs: (cmdPaste_Keytip_RESID) msgid "V" -msgstr "" +msgstr "V" #. Resource IDs: (IDS_COMMANDLINEHELP) msgid "" @@ -11484,7 +11484,7 @@ msgstr "웹 사이트 방문" #. Resource IDs: (cmdShowWhitespaces_Keytip_RESID) msgid "W" -msgstr "" +msgstr "W" #. Resource IDs: (Dialog IDD_SETTINGS_CONFIG: Control id 65535) msgid "" @@ -11691,7 +11691,7 @@ msgstr "오른쪽 경계를 넘어가는 긴 줄을 줄 바꿈 하기\n긴 줄 #. Resource IDs: (cmdRedo_Keytip_RESID) msgid "Y" -msgstr "" +msgstr "Y" #. Resource IDs: (IDS_PROC_YESTOALL) msgid "Yes to all" @@ -11705,6 +11705,11 @@ msgstr "이미 최신버전입니다." msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" @@ -11817,7 +11822,7 @@ msgstr "현재 설치된 버전: %d.%d.%d.%d" #. Resource IDs: (cmdUndo_Keytip_RESID) msgid "Z" -msgstr "" +msgstr "Z" #. Resource IDs: (IDS_ARCHIVEFILEFILTER) msgid "" @@ -11896,14 +11901,14 @@ msgstr "" msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" -msgstr "" +msgstr "\"%s\" 은 git 저장소를 포함하고 있습니다. 이 저장소는 박스 밖에서 서브모듈로 동작하지 않을 것입니다.\n.git 영역을 삭제하고 모든 파일을 최상단 저장소에 추가하시겠습니까? 아니면 하위 폴더에 별도의 저장소로 유지하시겠습니까?" #. Resource IDs: (IDS_PROC_COPY_SUBMODULE) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" -msgstr "" +msgstr "\"%s\" 은 git 서브모듈을 포함하고 있습니다. 대상 위치에 복사한 이후에는 동작하지 않을 것입니다.\n.git 영역을 삭제하고 모든 파일을 최상단 저장소에 추가하시겠습니까? 아니면 이러한 문제를 무시하고 그냥 두시겠습니까?" #. Resource IDs: (IDS_GITEXEERROR_NOMESSAGE) #, c-format @@ -11928,7 +11933,7 @@ msgid "" "\"%s\" will be permanently deleted. It can NOT be recovered!\n" "\n" "Do you really want to continue?" -msgstr "" +msgstr "\"%s\" 항목을 완전히 삭제합니다. 지워지면 복구할 수 없습니다!\n\n정말 계속하시겠습니까?" #. Resource IDs: (IDS_PROC_APPLYPATCH_GITAMACTIVE) msgid "" @@ -12004,7 +12009,7 @@ msgstr "" #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYCOL) #, c-format msgid "column '%ls'" -msgstr "" +msgstr "열 '%ls'" #. Resource IDs: (IDS_STATGRAPH_COMMITSBYAUTHORY, #. IDS_STATGRAPH_COMMITSBYDATEY) @@ -12054,7 +12059,7 @@ msgstr "git did not exit cleanly (exit code %d)\n에러가 발생했습니다!!" #. Resource IDs: (IDS_GITEXEFILEFILTER) msgid "git.exe|git.exe||" -msgstr "" +msgstr "git.exe|git.exe||" #. Resource IDs: (IDS_STATUSIGNORED) msgid "ignored" @@ -12177,7 +12182,7 @@ msgstr "이 명령에 대한 설명이 없습니다." #. Resource IDs: (IDS_CONFLICT_NOSUBMODULE) msgid "no submodule" -msgstr "" +msgstr "서브모듈 없음" #. Resource IDs: (IDS_STATUSUNVERSIONED) msgid "non-versioned" @@ -12241,7 +12246,7 @@ msgstr "분기" #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYRELPATHS) msgid "relative paths" -msgstr "" +msgstr "상대 경로" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 65535) msgid "renamed" diff --git a/Languages/Tortoise_lt.po b/Languages/Tortoise_lt.po index a9d3d4c96..24b58ea49 100644 --- a/Languages/Tortoise_lt.po +++ b/Languages/Tortoise_lt.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -20,7 +20,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: 2020-10-10 10:49+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Lithuanian (http://www.transifex.com/lznuaa/tortoisegit/language/lt/)\n" "MIME-Version: 1.0\n" @@ -1850,6 +1850,10 @@ msgstr "Leidžia atlikti tuščią patvirtinimą kuriame yra tik aprašymas (kom msgid "Already up to date." msgstr "Jau atnaujinta." +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "" @@ -2117,10 +2121,6 @@ msgstr "" msgid "Auto CrLf convert" msgstr "" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2147,6 +2147,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "" +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "" @@ -2921,6 +2925,18 @@ msgstr "" msgid "Colors" msgstr "Spalvos" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3197,6 +3213,14 @@ msgstr "Konfliktai" msgid "Conflicts: %d" msgstr "Konfliktai: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "" @@ -3319,9 +3343,9 @@ msgstr "Nepavyko rasti viršesnio projekto" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3552,6 +3576,10 @@ msgstr "" msgid "Creating pull-request..." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "" @@ -3870,6 +3898,18 @@ msgstr "" msgid "Dialogs" msgstr "Dialogai" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Skirt" @@ -3886,10 +3926,6 @@ msgstr "Palyginti du patvirtinimus" msgid "Diff Viewer" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "" @@ -4379,7 +4415,7 @@ msgstr "" msgid "Either the name or IP of the proxy server" msgstr "" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "El. pašto adresas" @@ -5153,16 +5189,16 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." -msgstr "Rastas užrakto failas parodo, kad perkėlimo ir apjungimo procesas yra aktyvuotas. Tai draudžia šį veiksmą.\n\nJei jūs šiuo metu nesate paleidę perkėlimo ir apjungimo, galite pašalinti užrakto failą ir tęsti veiksmus." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) msgid "" @@ -5265,42 +5301,6 @@ msgstr "" msgid "General" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "" @@ -5429,14 +5429,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5614,14 +5606,6 @@ msgstr "Patarimas: Paskutiniai patvirtinimo aprašai pasiekiami teksto įvedimo msgid "Hook Scripts" msgstr "Perėmimo skriptai" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "Perėmimo skriptai::Incidentų valdymo nustatymai" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Perėmimo skriptai::Incidentų valdymo diegimas" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Perėmimo tipas" @@ -5893,11 +5877,7 @@ msgid "Icon Overlays" msgstr "" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" +msgid "Icon Set" msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) @@ -6128,7 +6108,7 @@ msgid "Importing file %s" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6201,7 +6181,7 @@ msgstr "" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6226,6 +6206,14 @@ msgstr "" msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "Išdavė:" @@ -6706,6 +6694,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6877,10 +6869,6 @@ msgstr "" msgid "Network" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "Tinklas::El.paštas" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "" @@ -7157,7 +7145,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7474,7 +7462,7 @@ msgid "Others" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7493,6 +7481,10 @@ msgstr "" msgid "Output.prn" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "" @@ -7917,14 +7909,11 @@ msgid "Proxy Settings" msgstr "" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "" @@ -8166,14 +8155,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8250,7 +8243,8 @@ msgstr "" msgid "Reminder: Commit your change after resolve" msgstr "" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "" @@ -8773,8 +8767,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9236,7 +9230,7 @@ msgid "Show" msgstr "" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9409,7 +9403,7 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" +msgid "Show line number&s" msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) @@ -10230,6 +10224,10 @@ msgstr "Failas yra per didelis" msgid "The file is too large to open." msgstr "Failas yra per didelis atidarymui" +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10733,12 +10731,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10859,7 +10857,7 @@ msgid "Trim right" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11108,8 +11106,8 @@ msgid "Use .mailmap" msgstr "Naudoti .mailmap" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" -msgstr "Naudoti Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" +msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) msgid "Use HTTP path component" @@ -11693,6 +11691,11 @@ msgstr "" msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_nl.po b/Languages/Tortoise_nl.po index 2817ef6f9..6bc448af2 100644 --- a/Languages/Tortoise_nl.po +++ b/Languages/Tortoise_nl.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -27,7 +27,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Dutch (http://www.transifex.com/lznuaa/tortoisegit/language/nl/)\n" "MIME-Version: 1.0\n" @@ -1857,6 +1857,10 @@ msgstr "" msgid "Already up to date." msgstr "Reeds up-to-date." +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "" @@ -2124,10 +2128,6 @@ msgstr "Exacte auteursnamen" msgid "Auto CrLf convert" msgstr "Automatische CrLf conversie" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2154,6 +2154,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "Automatisch aanvullen stelt woorden voor (meestal class of member namen)\nuit de gewijzigde bestanden bij het invoeren van een logboekbericht." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "Automatisch Laden Putty &Key" @@ -2928,6 +2932,18 @@ msgstr "Kleur op basis van leeftijd, &continu" msgid "Colors" msgstr "Kleuren" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3204,6 +3220,14 @@ msgstr "Conflicten" msgid "Conflicts: %d" msgstr "In conflict: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "Context lijnen voor patches" @@ -3326,9 +3350,9 @@ msgstr "Kan het Super-project niet vinden" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3559,6 +3583,10 @@ msgstr "Maakt een unified diff bestand met al uw wijzigingen" msgid "Creating pull-request..." msgstr "Pull aanvraag aanmaken" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "Authenticatiemodule mag niet leeg zijn." @@ -3877,6 +3905,18 @@ msgstr "Venster afmetingen en posities" msgid "Dialogs" msgstr "Dialoogvensters" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Vergelijken" @@ -3893,10 +3933,6 @@ msgstr "Vergelijk Twee Vastleggingen" msgid "Diff Viewer" msgstr "Diff-viewer" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Diff-viewer::Samenvoeg gereedschap" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Diff toegevoegde lijnen" @@ -4386,7 +4422,7 @@ msgstr "Effectief" msgid "Either the name or IP of the proxy server" msgstr "De naam of het IP-adres van de proxyserver" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "E-mail" @@ -5160,15 +5196,15 @@ msgstr "Voorwaarts %d" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5272,42 +5308,6 @@ msgstr "Statistieken samenstellen" msgid "General" msgstr "Algemeen" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "Algemeen::Alternatieve editor" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "Algemeen::Kleuren 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "Algemeen::Kleuren 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "Algemeen::Kleuren 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Algemeen::Contextmenu" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "Algemeen::Contextmenu 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Algemeen::Dialoogvensters 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Algemeen::Dialoogvensters 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Algemeen::Dialoogvensters 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Haal samenvoegboodschappen" @@ -5436,14 +5436,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "Git::Authenticatie" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "Git::Extern Archief" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5621,14 +5613,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Hook-scripts" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Hook-scripts::Issue Tracker Integratie" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Soort hook" @@ -5900,12 +5884,8 @@ msgid "Icon Overlays" msgstr "Overlay iconen" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Overlay iconen::Iconen set" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Overlay iconen::Overlay handlers" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6135,7 +6115,7 @@ msgid "Importing file %s" msgstr "Bestand %s importeren" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6208,7 +6188,7 @@ msgstr "Plak de inhoud vna het klembord\nPlakken" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6233,6 +6213,14 @@ msgstr "Ongeldige valuta." msgid "Invalid revision number!" msgstr "Ongeldig revisienummer!" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6713,6 +6701,10 @@ msgstr "Samenvoegingspunt" msgid "Merge Reintegrate" msgstr "Reïntegratie samenvoeging" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6884,10 +6876,6 @@ msgstr "Genest" msgid "Network" msgstr "Netwerk" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "Netwerk::E-mail" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Nieuw" @@ -7164,7 +7152,7 @@ msgstr "Merk op dat als je voor het herstellen van de automatisch opgeslagen doc #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7481,7 +7469,7 @@ msgid "Others" msgstr "Anderen" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7500,6 +7488,10 @@ msgstr "Doelmap" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "Overschrijven" @@ -7924,14 +7916,11 @@ msgid "Proxy Settings" msgstr "Proxy Instellingen" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "Schoonmaken" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "Pull" @@ -8173,14 +8162,18 @@ msgid "Ref List" msgstr "Referentielijst" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" -msgstr "Referentiebrowser" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" +msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "Referentielogboek" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8257,7 +8250,8 @@ msgstr "Onthoud selectie (\"svn.rmdir\" instelling)" msgid "Reminder: Commit your change after resolve" msgstr "Let op: Leg uw wijzigingen vast na oplossing" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "Extern Archief" @@ -8780,8 +8774,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9243,8 +9237,8 @@ msgid "Show" msgstr "Toon" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" -msgstr "Toon &Referentielogboek" +msgid "Show &RefLog" +msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, #. IDS_PROC_LOG_SHOWUNVERSIONED) @@ -9416,8 +9410,8 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Toon regel&nummers" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10237,6 +10231,10 @@ msgstr "Het bestand is te groot" msgid "The file is too large to open." msgstr "Het bestand is te groot om te openen." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10740,12 +10738,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10866,7 +10864,7 @@ msgid "Trim right" msgstr "Rechts trimmen" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11115,8 +11113,8 @@ msgid "Use .mailmap" msgstr ".Mailmap gebruiken" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" -msgstr "Gebruik Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" +msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) msgid "Use HTTP path component" @@ -11700,6 +11698,11 @@ msgstr "De meest recente versie is reeds geïnstalleerd." msgid "You asked to pull, but did not specify a remote branch." msgstr "U vroeg om een pull uit te voeren maar vergat een remote branch te specifieren." +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_oc.po b/Languages/Tortoise_oc.po index c04027a37..b3fd17986 100644 --- a/Languages/Tortoise_oc.po +++ b/Languages/Tortoise_oc.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -12,7 +12,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/lznuaa/tortoisegit/language/oc/)\n" "MIME-Version: 1.0\n" @@ -1842,6 +1842,10 @@ msgstr "" msgid "Already up to date." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "" @@ -2109,10 +2113,6 @@ msgstr "" msgid "Auto CrLf convert" msgstr "" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2139,6 +2139,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "" +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "" @@ -2913,6 +2917,18 @@ msgstr "Color segon l'atge, &contunha" msgid "Colors" msgstr "Colors" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3189,6 +3205,14 @@ msgstr "" msgid "Conflicts: %d" msgstr "Conflictes : %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "Linhas de contèxte per de patchs" @@ -3311,9 +3335,9 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3544,6 +3568,10 @@ msgstr "Crèa un fichièr de diferéncia, al format unificat, amb totas vòstras msgid "Creating pull-request..." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "" @@ -3862,6 +3890,18 @@ msgstr "Talhas e posicions de las bóstias de dialòg" msgid "Dialogs" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Veire las diferéncias" @@ -3878,10 +3918,6 @@ msgstr "" msgid "Diff Viewer" msgstr "Visualizador de diferéncias" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Visualizador de diferéncias::Aisina de fusion" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Veire las diferéncias de las linhas apondudas" @@ -4371,7 +4407,7 @@ msgstr "" msgid "Either the name or IP of the proxy server" msgstr "Lo nom o l'adreça IP del servidor de proxy" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "" @@ -5145,15 +5181,15 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5257,42 +5293,6 @@ msgstr "" msgid "General" msgstr "General" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "General::Menú Contextual" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "General::Bóstia de Dialòg 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "General::Bóstia de Dialòg 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "General::Dialògs 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Obténer los jornals de fusion" @@ -5421,14 +5421,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5606,14 +5598,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Escripts associats" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Escripts associats::Integracion del Sistèma de Seguiment de Problèmas" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Tipe d'associacion d'escript" @@ -5885,12 +5869,8 @@ msgid "Icon Overlays" msgstr "Recobriments d'icòna" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Recobriments d'icòna::Jòc d'icònas" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Recobriments d'icòna::Gestionaris de Recobriment" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6120,7 +6100,7 @@ msgid "Importing file %s" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6193,7 +6173,7 @@ msgstr "Inserir lo quichapapièrs\nPegar" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6218,6 +6198,14 @@ msgstr "Moneda Invalida." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6698,6 +6686,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "Fusionar Reïntegrar" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6869,10 +6861,6 @@ msgstr "Nisat" msgid "Network" msgstr "Ret" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Novèl" @@ -7149,7 +7137,7 @@ msgstr "Notatz qu'avètz causit de recuperar los salvaments automatics dels docu #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7466,7 +7454,7 @@ msgid "Others" msgstr "Autres" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7485,6 +7473,10 @@ msgstr "" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "" @@ -7909,14 +7901,11 @@ msgid "Proxy Settings" msgstr "Configuracion del Proxy" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "" @@ -8158,14 +8147,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8242,7 +8235,8 @@ msgstr "" msgid "Reminder: Commit your change after resolve" msgstr "" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "" @@ -8765,8 +8759,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9228,7 +9222,7 @@ msgid "Show" msgstr "Afichar" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9401,8 +9395,8 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Veire losnumèros de linha&s" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10222,6 +10216,10 @@ msgstr "Lo fichièr es tròp voluminós." msgid "The file is too large to open." msgstr "Lo fichièr es tròp voluminós per èsser dobèrt." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10725,12 +10723,12 @@ msgstr "" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10851,7 +10849,7 @@ msgid "Trim right" msgstr "Rogner a dreita" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11100,7 +11098,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11685,6 +11683,11 @@ msgstr "Avètz ja la darrièra version installada." msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_pl.po b/Languages/Tortoise_pl.po index ff24bb598..9df72823f 100644 --- a/Languages/Tortoise_pl.po +++ b/Languages/Tortoise_pl.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -18,19 +18,19 @@ # mkrawiecki , 2011 # Pablos , 2012,2016 # Pablos , 2016 -# Sebastian Kaczorowski , 2015-2016 +# Sebastian Kaczorowski , 2015-2016,2021 # StasiekK <2stan2@gmail.com>, 2016 # StasiekK <2stan2@gmail.com>, 2016 # Sven Strickroth , 2020 -# taksun , 2019-2020 +# taksun , 2019-2021 # taksun , 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: 2020-10-07 09:37+0000\n" -"Last-Translator: Sven Strickroth \n" +"PO-Revision-Date: 2021-03-28 20:07+0000\n" +"Last-Translator: taksun \n" "Language-Team: Polish (http://www.transifex.com/lznuaa/tortoisegit/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -546,7 +546,7 @@ msgstr "&Usuń filtr" #. Resource IDs: (IDS_PROC_DELETEREMOTEBRANCH_LOCALREMOTE) msgid "&Delete branch on remote && local remote-tracking branch" -msgstr "" +msgstr "&Usuń zdalną gałąź && lokalne śledzenie gałęzi" #. Resource IDs: (IDS_DELETE_BRANCHTAG) msgid "&Delete branch/tag" @@ -1341,7 +1341,7 @@ msgstr "&Dyski nieznanych typów" #. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 32927) msgid "&Unlock" -msgstr "" +msgstr "&Odblokuj" #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" @@ -1371,7 +1371,7 @@ msgstr "&Widok" #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1851) msgid "&View effective config" -msgstr "" +msgstr "&Wyświetl skuteczną konfigurację" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 65535) msgid "&Warn on missing Signed-Off-By on commit" @@ -1717,11 +1717,11 @@ msgstr "Zatwierdzić inne zmiany?" #. Resource IDs: (IDS_STATUSLIST_CONTEXT_ADD_EXE) msgid "Add as Executable (+x)" -msgstr "" +msgstr "Dodaj jako wykonywalny (+ x)" #. Resource IDs: (IDS_STATUSLIST_CONTEXT_ADD_LINK) msgid "Add as Symlink" -msgstr "" +msgstr "Dodaj jako dowiązanie symboliczne" #. Resource IDs: (IDS_DLGTITLE_ADD_DIFF_TOOL) msgid "Add extension specific diff program" @@ -1859,6 +1859,10 @@ msgstr "Umożliwia utworzenie pustego zatwierdzenia składającego się jedynie msgid "Already up to date." msgstr "Już na bieżąco." +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "Alternatywny edytor" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "Zawsze wypychaj tę lokalną gałąź na wybrany zdalny zasób" @@ -2126,13 +2130,9 @@ msgstr "Autorzy bez uwzględnienia wielkości liter" msgid "Auto CrLf convert" msgstr "Automatyczna konwersja CrLf" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" -msgstr "" +msgstr "Automatyczne&CrLf:" #. Resource IDs: (IDS_PROGRS_CLOSE_NOCONFLICTS) msgid "Auto-close if no conflicts" @@ -2156,6 +2156,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "Autouzupełnianie sugeruje słowa (zazwyczaj klasy lub nazwy członków)\nz plików, które zostały zmienione w trakcie pisania wiadomości dziennika." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "Automatyczny CrLf:" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "AutoŁadowanie &klucza Putty" @@ -2423,7 +2427,7 @@ msgstr "Z&atwierdź" #. Resource IDs: (IDS_LOG_POPUP_COMMIT) msgid "C&ommit..." -msgstr "" +msgstr "Z&atwierdź" #. Resource IDs: (IDS_LOG_POPUP_COPY) msgid "C&reate branch/tag from revision" @@ -2930,10 +2934,22 @@ msgstr "&Kolorowanie wg wieku" msgid "Colors" msgstr "Kolory" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "Kolory 1" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "Kolory 2" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "Kolory 3" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" -msgstr "" +msgstr "Kolumna: %d" #. Resource IDs: (IDS_COMBINE_TO_ONE) msgid "Com&bine to one commit" @@ -3043,7 +3059,7 @@ msgstr "Zatwierdza twoje zmiany w repozytorium" #. Resource IDs: (IDS_PROC_LOG_COMMITTEREMAIL) msgid "Committer Email" -msgstr "" +msgstr "Email zatwierdzającego" #. Resource IDs: (IDS_COMMITDLG_UNVERSIONEDFOLDERWARNING) msgid "" @@ -3055,7 +3071,7 @@ msgstr "Zatwierdzenie folderu, który nie jest poddany kontroli wersji nie doda #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Common Name:" -msgstr "" +msgstr "Wspólna nazwa:" #. Resource IDs: (IDS_LOG_POPUP_COMPARECHANGESET) msgid "Comp&are change sets" @@ -3153,11 +3169,11 @@ msgstr "Skonfiguruj alternatywny edytor. Najlepiej taki, który obsługuje zako #. Resource IDs: (IDS_CONFIGUREDEFAULT) msgid "Configure default" -msgstr "" +msgstr "Skonfiguruj domyślnie" #. Resource IDs: (IDS_FIRSTSTART_GITTITLE) msgid "Configure git.exe" -msgstr "" +msgstr "Skonfiguruj git.exe." #. Resource IDs: (Dialog IDD_SETTINGSPROGSDIFF: Control id 65535) msgid "Configure the program used for comparing different revisions of files" @@ -3169,7 +3185,7 @@ msgstr "Program używany w celu rozwiązywania konfliktów pomiędzy plikami." #. Resource IDs: (IDS_FIRSTSTART_USERTITLE) msgid "Configure user information" -msgstr "" +msgstr "Skonfiguruj informacje o użytkowniku" #. Resource IDs: (Dialog IDD_SETTINGSPROGSDIFF: Control id 65535) msgid "Configure viewer program for GNU diff files (patch files)" @@ -3206,6 +3222,14 @@ msgstr "Konflikty" msgid "Conflicts: %d" msgstr "Konflikty: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "Menu kontekstowe" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "Menu kontekstowe 2" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "Linie kontekstu do poprawek" @@ -3328,9 +3352,9 @@ msgstr "Nie można znaleźć Super-projektu" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3458,7 +3482,7 @@ msgstr "Zliczono: %u dopasowań." #. Resource IDs: (IDS_MENUBRANCH) msgid "Create &Branch..." -msgstr "" +msgstr "Stwórz &gałąź..." #. Resource IDs: (Dialog IDD_SETTINGSMAIN: Control id 1683) msgid "Create &Library" @@ -3466,15 +3490,15 @@ msgstr "Utwórz &bibliotekę" #. Resource IDs: (Dialog IDD_GITSWITCH: Control id 1527) msgid "Create &New Branch" -msgstr "" +msgstr "Stwórz &nową gałąź" #. Resource IDs: (IDS_CREATE_TAG_AT_THIS) msgid "Create &Tag at this version..." -msgstr "" +msgstr "Utwórz &tag przy tej wersji..." #. Resource IDs: (IDS_MENUTAG) msgid "Create &Tag..." -msgstr "" +msgstr "Stwórz &tag..." #. Resource IDs: (cmdCreateUnifiedDiff_LabelTitle_RESID) msgid "Create &patch file" @@ -3561,6 +3585,10 @@ msgstr "Tworzy plik różnicowy, zawierający wszystkie twoje zmiany" msgid "Creating pull-request..." msgstr "Tworzenie prośby o połączenie..." +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "Poświadczenia" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "Pomocnik poświadczeń nie może być pusty." @@ -3571,7 +3599,7 @@ msgstr "Pomocnik poświadczeń:" #. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 65535) msgid "Credentials" -msgstr "" +msgstr "Poświadczenia" #. Resource IDs: (IDS_SCIEDIT_CUT) msgid "Cu&t" @@ -3639,7 +3667,7 @@ msgstr "Demon" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 1699) msgid "Dark theme" -msgstr "" +msgstr "Ciemny temat" #. Resource IDs: (IDS_DARKTHEME_TT) msgid "" @@ -3653,7 +3681,7 @@ msgstr "Data" #. Resource IDs: (IDS_DATELASTCOMMIT) msgid "Date Last Commit" -msgstr "" +msgstr "Data ostatniego zatwierdzenia" #. Resource IDs: (IDS_DEFAULT) msgid "Default" @@ -3726,7 +3754,7 @@ msgstr "Usuń gałąź" #. Resource IDs: (IDS_DELETE_LOCALTAG) msgid "Delete local tag" -msgstr "" +msgstr "Usuń lokalny tag" #. Resource IDs: (IDS_PROC_BROWSEREFS_DELETEREMOTEBRANCH) msgid "Delete remote branch" @@ -3755,7 +3783,7 @@ msgstr "Usuń tag" #. Resource IDs: (IDS_DELETE_REMOTETAG) msgid "Delete tag on remote" -msgstr "" +msgstr "Usuń tag na zdalnym" #. Resource IDs: (IDS_B_DELETEORDIFFERENTNAME) msgid "Delete the existing branch or use a different name." @@ -3763,7 +3791,7 @@ msgstr "Usuń istniejącą gałąź lub użyj innej nazwy." #. Resource IDs: (Dialog IDD_RESOLVE_CONFLICT: Control id 4570) msgid "Delete/modify merge conflict" -msgstr "" +msgstr "Usuń/modyfikuj scalenie konfliktu" #. Resource IDs: (IDS_DELETEWHENEMPTY_TASK3) msgid "" @@ -3879,6 +3907,18 @@ msgstr "Wielkości i położenia okien dialogowych" msgid "Dialogs" msgstr "Dialogi" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "Okno dialogowe 1" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "Okno dialogowe 2" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "Okno dialogowe 3" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "&Porównaj" @@ -3895,10 +3935,6 @@ msgstr "Porównaj dwa zatwierdzenia" msgid "Diff Viewer" msgstr "Przeglądarka różnic" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Przeglądarka różnic::Narzędzie scalania" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Porównaj dodane linie" @@ -3986,7 +4022,7 @@ msgstr "Wyłącz tą opcję, jeżeli posiadasz naprawdę duże kopie robocze i w #. Resource IDs: (IDS_DISABLEUPDATECHECKSBUTTON) msgid "Disable update checks" -msgstr "" +msgstr "Wyłącz kontrole aktualizacji" #. Resource IDs: (IDS_DETECT_MOVED_OR_COPIED_LINES_DISABLED) msgid "Disabled" @@ -4241,7 +4277,7 @@ msgstr "Pobierz" #. Resource IDs: (Dialog IDD_FIRSTSTARTWIZARD_LANGUAGE: Control id 65535) msgid "Download language packs:" -msgstr "" +msgstr "Pobierz pakiety językowe:" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 1073) msgid "Draw tag/branch labels on right side" @@ -4261,7 +4297,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_CLEAN: Control id 1731) msgid "Dry run" -msgstr "" +msgstr "Próbne uruchomienie" #. Resource IDs: (Dialog IDD_SYNC: Control id 1279) msgid "Dummy Button Form " @@ -4274,7 +4310,7 @@ msgstr "" #. Resource IDs: (cmdEditEnabled_Keytip_RESID, cmdTabEdit_Keytip_RESID) msgid "E" -msgstr "" +msgstr "E" #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_EDIT) msgid "E&dit unselected" @@ -4388,7 +4424,7 @@ msgstr "" msgid "Either the name or IP of the proxy server" msgstr "Nazwa lub adres IP serwera proxy" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "E-mail" @@ -4685,7 +4721,7 @@ msgstr "Program zewnętrzny:" #. Resource IDs: (cmdFind_Keytip_RESID) msgid "F" -msgstr "" +msgstr "F" #. Resource IDs: (IDS_MENUFETCH) msgid "F&etch..." @@ -5162,15 +5198,15 @@ msgstr "W przód %d" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5238,7 +5274,7 @@ msgstr "" #. Resource IDs: (cmdGotoLine_Keytip_RESID) msgid "G" -msgstr "" +msgstr "G" #. Resource IDs: (IDS_VIEW_SHOWGRAVATAR) msgid "G&ravatar" @@ -5274,42 +5310,6 @@ msgstr "Pobieranie statystyk" msgid "General" msgstr "Ogólne" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "Ogólne::Alternatywny edytor" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "Ogólne::Kolory 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "Ogólne::Kolory 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "Ogólne::Kolory 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Ogólne::Menu kontekstowe" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "Ogólne::Menu kontekstowe 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Ogólne::Okna dialogowe 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Ogólne::Okna dialogowe 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Ogólne::Okna dialogowe 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Pobierz dziennik scalania" @@ -5438,14 +5438,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "Git::Poświadczenia" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "Git::Zdalny" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5623,14 +5615,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Skrypty przechwytujące" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Skrypty przechwytujące::Integracja z systemami śledzenia błędów" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Typ przechwycenia" @@ -5665,7 +5649,7 @@ msgstr "ID:220:V C +G" #. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" -msgstr "" +msgstr "ID:32771:V C +W" #. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" @@ -5677,11 +5661,11 @@ msgstr "ID:32773:V C +O" #. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" -msgstr "" +msgstr "ID:32773:V CS+S" #. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" -msgstr "" +msgstr "ID:32774:V C +O" #. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" @@ -5694,7 +5678,7 @@ msgstr "ID:32775:V C +D" #. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" -msgstr "" +msgstr "ID:32776:V C +S" #. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" @@ -5706,20 +5690,20 @@ msgstr "ID:32779:V +S" #. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" -msgstr "" +msgstr "ID:32782:V C +P" #. Accelerator Entry for Menu ID:32787; '' #. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" -msgstr "" +msgstr "ID:32787:V C +F" #. Accelerator Entry for Menu ID:32789; '' msgid "ID:32789:VA +N" -msgstr "" +msgstr "ID:32789:VA +N" #. Accelerator Entry for Menu ID:32790; '' msgid "ID:32790:VA +P" -msgstr "" +msgstr "ID:32790:VA +P" #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" @@ -5743,7 +5727,7 @@ msgstr "ID:32818:V +H" #. Accelerator Entry for Menu ID:32819; '&Dark Mode\tD' msgid "ID:32819:V +D" -msgstr "" +msgstr "ID:32819:V +D" #. Accelerator Entry for Menu ID:32822; '' msgid "ID:32822:V C +F" @@ -5763,7 +5747,7 @@ msgstr "ID:32837:VA +M" #. Accelerator Entry for Menu ID:32857; '' msgid "ID:32857:VA +F" -msgstr "" +msgstr "ID:32857:VA +F" #. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" @@ -5771,7 +5755,7 @@ msgstr "ID:32870:V C +L" #. Accelerator Entry for Menu ID:32873; '' msgid "ID:32873:V C +E" -msgstr "" +msgstr "ID:32873:V C +E" #. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" @@ -5902,12 +5886,8 @@ msgid "Icon Overlays" msgstr "Nakładki ikon" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Nakładki ikon::Zestaw ikon" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Nakładki ikon::Uchwyty nakładek" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6137,8 +6117,8 @@ msgid "Importing file %s" msgstr "Importuję plik %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" -msgstr "Na liście zmian" +msgid "In Changelist" +msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) msgid "In Commits" @@ -6210,7 +6190,7 @@ msgstr "Wstaw zawartość schowka\nWklej" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6235,6 +6215,14 @@ msgstr "Niewłaściwa waluta." msgid "Invalid revision number!" msgstr "Błędny numer wersji!" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6300,7 +6288,7 @@ msgstr "koreański" #. Resource IDs: (cmdViewWrapLines_Keytip_RESID) msgid "L" -msgstr "" +msgstr "L" #. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) msgid "LFS" @@ -6715,6 +6703,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "Reintegruj scalanie" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6849,15 +6841,15 @@ msgstr "Mój plik:" #. 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" @@ -6886,10 +6878,6 @@ msgstr "Zagnieżdżony" msgid "Network" msgstr "Sieć" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "Sieć::E-mail" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Nowy" @@ -7166,7 +7154,7 @@ msgstr "Uwaga, jeśli wybierzesz, żeby automatycznie zapisane dokumenty został #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7483,7 +7471,7 @@ msgid "Others" msgstr "Innych" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7502,6 +7490,10 @@ msgstr "Katalog wyjściowy" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "Nadpisz" @@ -7516,15 +7508,15 @@ msgstr "" #. 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 @@ -7926,21 +7918,18 @@ msgid "Proxy Settings" msgstr "Ustawienia proxy" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" +msgstr "Przytnij" #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" -msgstr "" +msgstr "&Pobierz" #. Resource IDs: (IDS_MENUDESCPULL) msgid "Pull (fetch and merge) commits from a remote branch." -msgstr "" +msgstr "Pobierz (ściągnij i połącz) zatwierdzenia ze zdalnej gałęzi." #. Resource IDs: (IDS_PROC_SYNC_PULLWRONGBRANCH) msgid "" @@ -7950,11 +7939,11 @@ msgstr "" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 302) msgid "Pull/Fetch" -msgstr "" +msgstr "Pobierz/Ściągnij" #. Resource IDs: (IDS_PROC_PULL_DIFFS) msgid "Pulled Diff" -msgstr "" +msgstr "Pobrana różnica" #. Resource IDs: (IDS_PROC_PULL_LOG) msgid "Pulled Log" @@ -7962,40 +7951,40 @@ msgstr "" #. Resource IDs: (IDS_PROC_SYNC_PUSH) msgid "Pus&h" -msgstr "" +msgstr "Wypc&hnij" #. Resource IDs: (IDS_MENUPUSH) msgid "Pus&h..." -msgstr "" +msgstr "Wypc&hnij..." #. Resource IDs: (Dialog IDD_PUSH: Control id 303, Dialog IDD_SYNC: Control id #. 1612) msgid "Push" -msgstr "" +msgstr "Wypchnij" #. Resource IDs: (Dialog IDD_PUSH: Control id 1492) msgid "Push &option:" -msgstr "" +msgstr "&Opcje wypychania:" #. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1786) msgid "Push Default" -msgstr "" +msgstr "Wypychanie domyślne" #. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 65535) msgid "Push URL:" -msgstr "" +msgstr "URL wypychania:" #. Resource IDs: (IDS_MENUDESCPUSH) msgid "Push commits to a remote repository." -msgstr "" +msgstr "Wypchnij zmiany do zdalnego repozytorium." #. Resource IDs: (IDS_PROC_SYNC_PUSHNOTES) msgid "Push notes" -msgstr "" +msgstr "Wypchnij notatki" #. Resource IDs: (IDS_PROC_SYNC_PUSHTAGS) msgid "Push ta&gs" -msgstr "" +msgstr "Wypchnij ta&gi" #. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 65535) msgid "Putty Key:" @@ -8019,11 +8008,11 @@ msgstr "Wyjdź\nZakończenie TortoiseGitMerge bez zapisu zmian" #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1633) msgid "QuotePath" -msgstr "" +msgstr "Ścieżka zapytania" #. Resource IDs: (cmdReload_Keytip_RESID) msgid "R" -msgstr "" +msgstr "R" #. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1073) msgid "R&AM drives" @@ -8175,14 +8164,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8259,7 +8252,8 @@ msgstr "Zapamiętaj wybór (opcja \"svn.rmdir\")" msgid "Reminder: Commit your change after resolve" msgstr "Przypomnienie: Zatwierdź zmianę po rozwiązaniu" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "Zdalny" @@ -8693,7 +8687,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) @@ -8782,8 +8776,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9245,7 +9239,7 @@ msgid "Show" msgstr "Pokaż" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9418,8 +9412,8 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Pokaż &numery linii" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10068,7 +10062,7 @@ msgstr "Tag" #. Resource IDs: (IDS_PROC_TAG_FF) msgid "Tag (FF)" -msgstr "" +msgstr "Tag (FF)" #. Resource IDs: (IDS_PROC_LOG_TAGINFO) msgid "Tag Info" @@ -10239,6 +10233,10 @@ msgstr "Plik jest zbyt duży" msgid "The file is too large to open." msgstr "Plik jest zbyt duży, aby go otworzyć." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10742,12 +10740,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10868,7 +10866,7 @@ msgid "Trim right" msgstr "Przytnij z prawej" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11117,7 +11115,7 @@ msgid "Use .mailmap" msgstr "Użyj pliku .mailmap" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11373,7 +11371,7 @@ msgstr "Używa typ pamięci podręcznej statusu 'brak' dla procesów podwyższon #. Resource IDs: (cmdPaste_Keytip_RESID) msgid "V" -msgstr "" +msgstr "V" #. Resource IDs: (IDS_COMMANDLINEHELP) msgid "" @@ -11481,7 +11479,7 @@ msgstr "Odwiedź naszą stronę internetową" #. Resource IDs: (cmdShowWhitespaces_Keytip_RESID) msgid "W" -msgstr "" +msgstr "W" #. Resource IDs: (Dialog IDD_SETTINGS_CONFIG: Control id 65535) msgid "" @@ -11688,7 +11686,7 @@ msgstr "Zawijanie długich linia na prawym brzegu widoku\nZawijaj długie linie" #. Resource IDs: (cmdRedo_Keytip_RESID) msgid "Y" -msgstr "" +msgstr "Y" #. Resource IDs: (IDS_PROC_YESTOALL) msgid "Yes to all" @@ -11702,6 +11700,11 @@ msgstr "Masz już zainstalowaną najnowszą wersję." msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" @@ -11814,7 +11817,7 @@ msgstr "Twoja wersja: %d.%d.%d.%d" #. Resource IDs: (cmdUndo_Keytip_RESID) msgid "Z" -msgstr "" +msgstr "Z" #. Resource IDs: (IDS_ARCHIVEFILEFILTER) msgid "" @@ -12077,7 +12080,7 @@ msgstr "niekompletny" #. Control id 1780, Dialog IDD_SETTINGSDIALOGS3: Control id 1781, Dialog #. IDD_SETTINGSDIALOGS3: Control id 1782) msgid "inherit" -msgstr "" +msgstr "dziedziczony" #. Resource IDs: (IDS_STATUSLIST_KEEPLOCAL) msgid "item kept locally" @@ -12194,11 +12197,11 @@ msgstr "nie znaleziono" #. Resource IDs: (IDS_CONFLICT_SUBMODULENOTINITIALIZED) msgid "not initialized" -msgstr "" +msgstr "nie zainicjowany" #. Resource IDs: (cmdOpen_Keytip_RESID) msgid "o1" -msgstr "" +msgstr "o1" #. Resource IDs: (IDS_STATUSOBSTRUCTED) msgid "obstructed" diff --git a/Languages/Tortoise_pt_BR.po b/Languages/Tortoise_pt_BR.po index 8ec7958e6..9317d05d5 100644 --- a/Languages/Tortoise_pt_BR.po +++ b/Languages/Tortoise_pt_BR.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -41,14 +41,14 @@ # Thiago Feldhaus , 2016 # Thiago Feldhaus , 2016,2019 # Tiago G. Sala, 2018 -# Tiago G. Sala, 2018 +# Tiago Sala, 2018 # Victor Westmann , 2012,2015 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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/lznuaa/tortoisegit/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -1878,6 +1878,10 @@ msgstr "Permite para criar um commit vazia que tem apenas uma mensagem de confir msgid "Already up to date." msgstr "Já está atualizado." +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "Sempre empurrar para o arquivo remoto selecionado para este ramo local" @@ -2145,10 +2149,6 @@ msgstr "Autores sensível a caixa" msgid "Auto CrLf convert" msgstr "Converter automaticamente CrLf" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2175,6 +2175,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "O autocompletar sugere palavras (geralmente nomes de classes ou\nmembros)\nda lista de arquivos que você alterou a medida que você digita sua mensagem de histórico." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "Auto Carregar &Chave SSH" @@ -2949,6 +2953,18 @@ msgstr "Cor por idade, &contínua" msgid "Colors" msgstr "Cores" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3225,6 +3241,14 @@ msgstr "Conflitos" msgid "Conflicts: %d" msgstr "Conflitos: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "Linhas de contexto para correções" @@ -3347,10 +3371,10 @@ msgstr "Não foi possível encontrar o Super-projeto" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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 "Não foi possível encontrar a string de versão do \"msysgit\" ou \"windows\" para o git.exe.\nSe você está usando o ambiente cygwin ou msys2, você precisa ativar os hacks especiais.\nPara mais informações, procure no arquivo de ajuda por \"cygwin git\" ou \"msys2 git\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) #, c-format @@ -3580,6 +3604,10 @@ msgstr "Cria um arquivo de comparação unificado com todas as alterações feit msgid "Creating pull-request..." msgstr "Criando pedido de puxar..." +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "O assistente de credenciais não pode ficar vazio." @@ -3898,6 +3926,18 @@ msgstr "Dimensões e posições dos diálogos" msgid "Dialogs" msgstr "Diálogos" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Comparação" @@ -3914,10 +3954,6 @@ msgstr "Diferenciar Duas Submissões" msgid "Diff Viewer" msgstr "Visualizador de Diferenças" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Visualizador de Diferenças::Ferramenta de Combinação" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Linhas adicionadas ao Diff" @@ -4407,7 +4443,7 @@ msgstr "Efetivo" msgid "Either the name or IP of the proxy server" msgstr "Nome ou IP do servidor proxy" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "Email" @@ -5181,16 +5217,16 @@ msgstr "Avançar %d" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." -msgstr "Encontrada string de versão do git \"msysgit\" ou \"windows\", entretanto, você tem os hacks do git.exe ativos. Estes hacks devem ser desativados para funcionamento correto com o Git para Windows!\nVocê pode encontrar mais informações no arquivo de ajuda para as palavras-chave \"cygwin git\" ou \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." +msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." -msgstr "Um arquivo de trava foi encontrado, indicando que um processo de reorganização do TortoiseGit está em execução. Isto bloqueia esta operação.\n\nSe você não está executando um processo de reorganização do TortoiseGit agora, você pode remover este arquivo de trava sobressalente para continuar." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) msgid "" @@ -5293,42 +5329,6 @@ msgstr "Reunindo estatísticas" msgid "General" msgstr "Geral" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "Geral::Editor alternativo" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "Geral::Cores 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "Geral::Cores 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "Geral::Cores 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Geral::Menu de Contexto" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "Geral::Menu de Contexto 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Geral::Diálogos 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Geral::Diálogos 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Geral::Diálogos 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Pegar histórico de combinação" @@ -5457,14 +5457,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "O Git usa o conceito de configuração hierárquica.\nEx.: há múltiplos níveis; configurações em níveis mais altos sobrepõem valores em níveis mais baixos.\nA aba \"Efetiva\" exibe os valores efetivos do escopo atual (somente leitura).\nSelecione qualquer nível para ver os valores armazenados lá.\nPara mudar configurações selecione um nível, entre os valores e selecione onde armazená-los." -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "Git::Credencial" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "Git::Remoto" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5642,14 +5634,6 @@ msgstr "Dica: Mensagens de submissão recentemente utilizadas estão disponívei msgid "Hook Scripts" msgstr "Scripts de Gancho" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "Scripts de Gancho::Configuração dos Rastreadores de Problemas" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Scripts de Gancho::Integração com o Rastreador de Problemas" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Tipo de Gancho" @@ -5921,12 +5905,8 @@ msgid "Icon Overlays" msgstr "Sobreposição de Ícones" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Sobreposição de Ícones::Conjunto de Ícones" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Sobreposição de Ícones::Gerenciadores de Sobreposição" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6156,8 +6136,8 @@ msgid "Importing file %s" msgstr "Obtendo arquivo %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" -msgstr "Na Lista de Alterações" +msgid "In Changelist" +msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) msgid "In Commits" @@ -6229,7 +6209,7 @@ msgstr "Inserir o conteúdo da Área de Transferência\nColar" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6254,6 +6234,14 @@ msgstr "Moeda inválida." msgid "Invalid revision number!" msgstr "Número de revisão inválido!" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "Problema:" @@ -6734,6 +6722,10 @@ msgstr "Ponto de mescla" msgid "Merge Reintegrate" msgstr "Reintegrar Combinação" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6905,10 +6897,6 @@ msgstr "Aninhado" msgid "Network" msgstr "Rede" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "Rede::Email" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Novo" @@ -7185,7 +7173,7 @@ msgstr "Note que se você escolher recuperar os documentos, você precisa salvá #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7502,8 +7490,8 @@ msgid "Others" msgstr "Outros" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" -msgstr "Fora da Lista de Alterações" +msgid "Out Changelist" +msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) msgid "Out Commits" @@ -7521,6 +7509,10 @@ msgstr "Diretório de Saída" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "Sobrescrever" @@ -7945,14 +7937,11 @@ msgid "Proxy Settings" msgstr "Configurações de Proxy" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "Aparar" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "Aparar (Todos os remotos)" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "Puxar" @@ -8194,14 +8183,18 @@ msgid "Ref List" msgstr "Lista de Referências" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" -msgstr "ProcurarRef" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" +msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "RefLog" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "Submissão de referências está ligada." @@ -8278,7 +8271,8 @@ msgstr "Lembrar seleção (\"svn.rmdir\" opção)" msgid "Reminder: Commit your change after resolve" msgstr "Lembrete: Submeta suas mudanças após resolver" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "Remoto" @@ -8801,8 +8795,8 @@ msgid "Sa&feCrLf:" msgstr "CrLfSe&guro:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Crlf Seguro:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9264,8 +9258,8 @@ msgid "Show" msgstr "Exibir" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" -msgstr "Exibir &Reflog" +msgid "Show &RefLog" +msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, #. IDS_PROC_LOG_SHOWUNVERSIONED) @@ -9437,8 +9431,8 @@ msgid "Show la&beled commits only" msgstr "Exibir apenas submissões &rotuladas" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Exibir &números de linha" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10258,6 +10252,10 @@ msgstr "O arquivo é muito grande" msgid "The file is too large to open." msgstr "O arquivo é muito grande para ser aberto." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10761,12 +10759,12 @@ msgstr "TortoiseGitBlame, Versão %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10887,7 +10885,7 @@ msgid "Trim right" msgstr "Aparar à direita" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11136,8 +11134,8 @@ msgid "Use .mailmap" msgstr "Usar .mailmap" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" -msgstr "Usar Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" +msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) msgid "Use HTTP path component" @@ -11721,6 +11719,11 @@ msgstr "Você já possui a versão mais atual instalada." msgid "You asked to pull, but did not specify a remote branch." msgstr "Você pediu para puxar, mas não especificou um ramo remoto." +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_pt_PT.po b/Languages/Tortoise_pt_PT.po index 1ee481e3b..7f499c823 100644 --- a/Languages/Tortoise_pt_PT.po +++ b/Languages/Tortoise_pt_PT.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -25,7 +25,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/lznuaa/tortoisegit/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -1855,6 +1855,10 @@ msgstr "" msgid "Already up to date." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "" @@ -2122,10 +2126,6 @@ msgstr "Autores sensível a caixa (maiúsculas/minúscula)" msgid "Auto CrLf convert" msgstr "" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2152,6 +2152,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "À medida que escreve a mensagem de registo a completação automática sugere palavras\n(normalmente nomes de classes ou de membros) retiradas dos arquivos alterados." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "" @@ -2926,6 +2930,18 @@ msgstr "Cor por idade, &continua" msgid "Colors" msgstr "Cores" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3202,6 +3218,14 @@ msgstr "" msgid "Conflicts: %d" msgstr "Conflitos: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "Linhas de contexto para patches" @@ -3324,9 +3348,9 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3557,6 +3581,10 @@ msgstr "Cria um ficheiro de comparação unificado com todas as alterações que msgid "Creating pull-request..." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "" @@ -3875,6 +3903,18 @@ msgstr "Dimensões e posições das caixas de diálogo" msgid "Dialogs" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Comparar" @@ -3891,10 +3931,6 @@ msgstr "" msgid "Diff Viewer" msgstr "Visualizador de dif" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Visualizador de dif::Ferramenta de Integração" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "" @@ -4384,7 +4420,7 @@ msgstr "" msgid "Either the name or IP of the proxy server" msgstr "Nome ou endereço IP do servidor proxy" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "" @@ -5158,15 +5194,15 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5270,42 +5306,6 @@ msgstr "" msgid "General" msgstr "Geral" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "Geral::Cores 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "Geral::Cores 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "Geral::Cores 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Geral::Menu de Atalho" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Geral::Diálogos 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Geral::Diálogos 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Geral::Diálogos 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Obter registos de integração" @@ -5434,14 +5434,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5619,14 +5611,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Scripts de Gancho" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Scripts de Gancho::Integração do Controlador de Problemas" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Tipo de Gancho" @@ -5898,12 +5882,8 @@ msgid "Icon Overlays" msgstr "Sobreposição de Ícones" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Sobreposição de Ícones::Conjunto de Ícones" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Sobreposição de Ícones::Manipuladores de Sobreposição" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6133,7 +6113,7 @@ msgid "Importing file %s" msgstr "Importando arquivo %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6206,7 +6186,7 @@ msgstr "Inserir conteúdo da Área de Transferência\nColar" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6231,6 +6211,14 @@ msgstr "Moeda Inválida." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6711,6 +6699,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "Reintegrar Integração" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6882,10 +6874,6 @@ msgstr "Aninhado" msgid "Network" msgstr "Rede" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Novo" @@ -7162,7 +7150,7 @@ msgstr "Nota que se decidires recuperar os documentos salvos automáticamente, t #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7479,7 +7467,7 @@ msgid "Others" msgstr "Outros" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7498,6 +7486,10 @@ msgstr "" msgid "Output.prn" msgstr "Saída.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "" @@ -7922,14 +7914,11 @@ msgid "Proxy Settings" msgstr "Preferências do Proxy" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "" @@ -8171,14 +8160,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8255,7 +8248,8 @@ msgstr "" msgid "Reminder: Commit your change after resolve" msgstr "" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "" @@ -8778,8 +8772,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9241,7 +9235,7 @@ msgid "Show" msgstr "Mostrar" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9414,8 +9408,8 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Mostrar número&s de linhas" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10235,6 +10229,10 @@ msgstr "O arquivo é demasiado grande" msgid "The file is too large to open." msgstr "O arquivo demasiado grande para ser aberto." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10738,12 +10736,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10864,7 +10862,7 @@ msgid "Trim right" msgstr "aparar à direita" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11113,7 +11111,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11698,6 +11696,11 @@ msgstr "Já possui a versão mais actual instalada." msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_ro.po b/Languages/Tortoise_ro.po index 11bad7fed..6bac74a67 100644 --- a/Languages/Tortoise_ro.po +++ b/Languages/Tortoise_ro.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Romanian (http://www.transifex.com/lznuaa/tortoisegit/language/ro/)\n" "MIME-Version: 1.0\n" @@ -1859,6 +1859,10 @@ msgstr "" msgid "Already up to date." msgstr "Deja la zi." +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "Împinge intotdeauna spre arhiva destinaţie selectată pentru această ramură locală" @@ -2126,10 +2130,6 @@ msgstr "Autori cu majuscule semnificative" msgid "Auto CrLf convert" msgstr "Conversie CrLf automată" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2156,6 +2156,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "Completarea automată sugerează cuvinte (de obicei nume de clasă sau de membru)\nîn timp ce scrieţi un mesaj în jurnal, folosind date din fişierele recent schimbate." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "Incarcă &automat cheie Putty" @@ -2930,6 +2934,18 @@ msgstr "Colorează conform vechimii, &continuu" msgid "Colors" msgstr "Culori" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3206,6 +3222,14 @@ msgstr "Conflicte" msgid "Conflicts: %d" msgstr "Conflicte: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "Linii contextuale pentru peticire" @@ -3328,9 +3352,9 @@ msgstr "Nu s-a putut găsi Super-proiectul" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3561,6 +3585,10 @@ msgstr "Creează un fişier de diferenţiere folosind toate schimbările pe care msgid "Creating pull-request..." msgstr "Se creează cerere de tragere..." +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "Asistentul de credenţiale nu trebuie sa fie nul." @@ -3879,6 +3907,18 @@ msgstr "Dimensiunile şi poziţiile dialogurilor" msgid "Dialogs" msgstr "Dialoguri" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Diferenţiază" @@ -3895,10 +3935,6 @@ msgstr "Diferenţiază două transmiteri" msgid "Diff Viewer" msgstr "Vizualizator diferenţe" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Vizualizator diferenţe::Unealtă de îmbinare" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Diferentiere linii adaugate" @@ -4388,7 +4424,7 @@ msgstr "Efectiv" msgid "Either the name or IP of the proxy server" msgstr "Sau numele sau IP-ul serverului proxy" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "Email" @@ -5162,15 +5198,15 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5274,42 +5310,6 @@ msgstr "Se adună statistici" msgid "General" msgstr "Generalităţi" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "Generalităţi::Editor alternativ" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "Generalităţi::Culori 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "Generalităţi::Culori 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "Generalităţi::Culori 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Generalităţi::Meniu contextual" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "Generalităţi::Meniu contextual 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Generalităţi::Dialoguri 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Generalităţi::Dialoguri 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Generalităţi::Dialoguri 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Obţine jurnalele de îmbinare" @@ -5438,14 +5438,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "Git::Credential" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "Git::Destinaţie" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5623,14 +5615,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Scripturi hook" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "Scripturi hook::Configurare program urmărire probleme" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Scripturi hook::Integrare monitor de probleme" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Tip hook" @@ -5902,12 +5886,8 @@ msgid "Icon Overlays" msgstr "Suprapuneri de iconiţe" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Suprapuneri de iconiţe::Set de iconiţe" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Suprapuneri de iconiţe::Manageri de suprapunere" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6137,8 +6117,8 @@ msgid "Importing file %s" msgstr "Se importă fişierul %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" -msgstr "În lista de schimbări" +msgid "In Changelist" +msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) msgid "In Commits" @@ -6210,7 +6190,7 @@ msgstr "Inserează conţinuturile din clipboard\nInserează" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6235,6 +6215,14 @@ msgstr "Valuta nu este valabilă." msgid "Invalid revision number!" msgstr "Numărul reviziei este invalid!" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6715,6 +6703,10 @@ msgstr "Punct de îmbinare" msgid "Merge Reintegrate" msgstr "Reintegrează îmbinarea" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6886,10 +6878,6 @@ msgstr "Imbricat" msgid "Network" msgstr "Reţea" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "Reţea::Email" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Nou" @@ -7166,7 +7154,7 @@ msgstr "Dacă decideți să recuperați documentele auto-salvate, va trebui să #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7483,8 +7471,8 @@ msgid "Others" msgstr "Alţii" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" -msgstr "Listă de schimbări de ieşire" +msgid "Out Changelist" +msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) msgid "Out Commits" @@ -7502,6 +7490,10 @@ msgstr "Dosar destinaţie" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "Suprascrie" @@ -7926,14 +7918,11 @@ msgid "Proxy Settings" msgstr "Preferinţe proxy" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "Taiere" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "Taiere (toate departarile)" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "Trage" @@ -8175,14 +8164,18 @@ msgid "Ref List" msgstr "Lista referinte" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" -msgstr "Răsfoire referinţe" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" +msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "JurnalRef" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8259,7 +8252,8 @@ msgstr "Reţine selecţia (opţiune \"svn.rmdir\")" msgid "Reminder: Commit your change after resolve" msgstr "De reţinut: Transmiteţi schimbările dupa rezolvare" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "Destinaţie" @@ -8782,8 +8776,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9245,8 +9239,8 @@ msgid "Show" msgstr "Afişează" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" -msgstr "Arată &Reflog" +msgid "Show &RefLog" +msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, #. IDS_PROC_LOG_SHOWUNVERSIONED) @@ -9418,8 +9412,8 @@ msgid "Show la&beled commits only" msgstr "Arata doar transmiterile cu etichete" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Afişaţi &numărul liniilor" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10239,6 +10233,10 @@ msgstr "Fişierul este prea mare" msgid "The file is too large to open." msgstr "Fişierul este prea mare pentru a fi deschis." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10742,12 +10740,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10868,7 +10866,7 @@ msgid "Trim right" msgstr "Decupează la dreapta" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11117,7 +11115,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11702,6 +11700,11 @@ msgstr "Aveţi deja instalată ultima versiune." msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_ru.po b/Languages/Tortoise_ru.po index 7cb5609b6..12c1c5180 100644 --- a/Languages/Tortoise_ru.po +++ b/Languages/Tortoise_ru.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -27,9 +27,10 @@ # Maxim Gutsul , 2017 # Nikolay Falileev , 2017 # 82f4f02557fd4886d250a2aa0aecb530_0f90749 <0cd40767d55b0248271195f29db18a8d_208365>, 2014 +# Sergey Kuznetsov , 2021 # Alexander Shchekaturov , 2013 -# Stanislav Kroter , 2016-2020 -# Sven Strickroth , 2012-2013,2020 +# Stanislav Kroter , 2016-2021 +# Sven Strickroth , 2012-2013,2020-2021 # Дмитрий Сытьков , 2011 # Arioch , 2013 # Arioch , 2012 @@ -47,7 +48,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: 2020-10-07 15:11+0000\n" +"PO-Revision-Date: 2021-03-16 15:09+0000\n" "Last-Translator: Stanislav Kroter \n" "Language-Team: Russian (http://www.transifex.com/lznuaa/tortoisegit/language/ru/)\n" "MIME-Version: 1.0\n" @@ -346,7 +347,7 @@ msgstr "&..." #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1656) msgid "&3 way merge" -msgstr "&3-х сторонние слияние" +msgstr "&3-х стороннее слияние" #. Resource IDs: (IDS_MSGBOX_ABORT) msgid "&Abort" @@ -1877,6 +1878,10 @@ msgstr "Позволяет создать пустой коммит, в кото msgid "Already up to date." msgstr "Уже обновлено" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "Альтернативный редактор" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "Всегда отправлять в выбранное внешнее хранилище архив для этой локальной ветви" @@ -2144,10 +2149,6 @@ msgstr "Авторы c учётом регистра" msgid "Auto CrLf convert" msgstr "Автоматическое преобразование завершения строк" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Авто Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "Авто&CrLf:" @@ -2174,6 +2175,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "Автозавершение во время набора сообщения журнала предлагает слова\n(обычно имена классов или членов) из файлов, которые были изменены." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "AutoCRLF:" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "Автоматически использовать ключ" @@ -2948,6 +2953,18 @@ msgstr "Цвет по возрасту, &непрерывно" msgid "Colors" msgstr "Цвета" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "Цвета 1" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "Цвета 2" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "Цвета 3" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3224,6 +3241,14 @@ msgstr "Конфликты" msgid "Conflicts: %d" msgstr "Конфликты: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "Контекстное меню" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "Контекстное меню 2" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "Контекстные строки для исправлений" @@ -3346,10 +3371,10 @@ msgstr "Не могу найти родительский модуль" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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 "Не получилось найти \"msysgit\" или \"windows\" в строке версий git.exe.\nЕсли вы используете git окружения cygwin или msys2, то вам нужно задействовать специальные временные программные решения.\nБолее подробную информацию смотрите в справке по ключевому слову \"cygwin git\" или \"msys2 git\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) #, c-format @@ -3579,6 +3604,10 @@ msgstr "Создает файл объединённых различий со msgid "Creating pull-request..." msgstr "Создаю запрос-получение..." +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "Удостоверяющий центр не может быть пустым." @@ -3897,6 +3926,18 @@ msgstr "Размеры и расположение диалогов" msgid "Dialogs" msgstr "Диалоги" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "Диалоги 1" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "Диалоги 2" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "Диалоги 3" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Различия" @@ -3913,10 +3954,6 @@ msgstr "Сравнение двух фиксаций" msgid "Diff Viewer" msgstr "Просмотр различий" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Просмотр различий::Инструмент для слияния" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Сравнить добавленные линии" @@ -4406,7 +4443,7 @@ msgstr "Итог" msgid "Either the name or IP of the proxy server" msgstr "Введите имя либо IP-адрес прокси-сервера" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "Эл.почта" @@ -5180,16 +5217,16 @@ msgstr "Вперёд %d" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." -msgstr "Найдено \"msysgit\" или \"windows\" в строке версии git.exe, однако вы включили временные решения git.exe. Эти временные решения должны быть отключены для правильной работы с Git для Windows!\nБольше информации вы можете найти в файле справки для ключевого слова \"cygwin git\" или \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." +msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." -msgstr "Обнаружен блокирующий файл, указывающий, что идёт процесс перебазирования TortoiseGit. Это блокирует эту операцию.\n\nЕсли вы не запускали процесс перебазирования TortoiseGit прямо сейчас, то вы можете удалить устаревший блокирующий файл, чтобы продолжить." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) msgid "" @@ -5292,42 +5329,6 @@ msgstr "Сбор статистики" msgid "General" msgstr "Общее" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "Общее::Альтернативный редактор" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "Общее::Цвета 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "Общее::Цвета 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "Общее::Цвета 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Общее::Контекстное меню" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "Общее::Контекстное меню 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Общее::Диалоги 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Общее::Диалоги 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Общее::Диалоги 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Получить информацию о слияниях" @@ -5456,14 +5457,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "Git использует концепцию иерархической конфигурации.\nТ.е. существует множество уровней; настройки вышележащих уровней переопределяют значения нижележащих уровней.\nВкладка \"Эффективные\" показывает вам действующие значения, имеющие силу в текущей области (только для чтения).\nВыберите любой уровень для просмотра значений, сохранённых в нем.\nДля того чтобы изменить настройки, выберите уровень, введите значения и выберите куда их сохранить." -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "Git::Удостоверения" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "Git::Внешнее" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5641,14 +5634,6 @@ msgstr "Подсказка: Недавно использованные сооб msgid "Hook Scripts" msgstr "Скрипты Хуков" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "Скрипты хуков::Конфигурация отслеживания проблем" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Скрипты хуков::Интеграция с системой отслеживания проблем" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Тип Хука" @@ -5920,12 +5905,8 @@ msgid "Icon Overlays" msgstr "Пометки на значках" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Пометки на значках::Набор значков" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Пометки на значках::Обработчики наложений" +msgid "Icon Set" +msgstr "Набор иконок" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6155,8 +6136,8 @@ msgid "Importing file %s" msgstr "Импорт файла %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" -msgstr "В группе изменений" +msgid "In Changelist" +msgstr "В список изменений" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) msgid "In Commits" @@ -6228,7 +6209,7 @@ msgstr "Вставить содержимое буфера обмена\nВст #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6253,6 +6234,14 @@ msgstr "Неправильное денежное значение." msgid "Invalid revision number!" msgstr "Неверный номер ревизии!" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "Файл настроек системы отслеживания ошибок" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "Интеграция с системой отслеживания ошибок" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "Издатель:" @@ -6378,7 +6367,7 @@ msgstr "Язык:" #. Resource IDs: (IDS_MENUDESCLFS) msgid "Large file storage" -msgstr "" +msgstr "Хранилище больших файлов" #. Resource IDs: (IDS_LAST_N_COMMITS) #, c-format @@ -6733,6 +6722,10 @@ msgstr "Точка слияния" msgid "Merge Reintegrate" msgstr "Воссоединительное слияние" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "Инструмент слияния" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6904,10 +6897,6 @@ msgstr "Вложен" msgid "Network" msgstr "Сеть" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "Сеть::Эл.почта" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Новый" @@ -7184,8 +7173,8 @@ msgstr "Заметьте, если вы решите восстановить а #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." -msgstr "Обратите внимание: Эти настройки также применяются к диалогу просмотра заплаток.\nЧтобы выбрать, хотите ли вы использовать встроенную либо любую альтернативную программу просмотра различий, перейдите в раздел \"Просмотра различий\" в дереве слева." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) msgid "Note: the folder contains unversioned items" @@ -7501,8 +7490,8 @@ msgid "Others" msgstr "Остальные" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" -msgstr "Вне листа изменений" +msgid "Out Changelist" +msgstr "Из списка изменений" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) msgid "Out Commits" @@ -7520,6 +7509,10 @@ msgstr "Каталог назначения" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "Перезаписать" @@ -7944,14 +7937,11 @@ msgid "Proxy Settings" msgstr "Настройки сервера-посредника" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "Упростить" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "Подрезать (все внешние)" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "Получить" @@ -8193,14 +8183,18 @@ msgid "Ref List" msgstr "Список Ссылок" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" -msgstr "Просмотр ссылки" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" +msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "ЖурналСсылок" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "Ссылки, содержащие этот коммит" @@ -8277,7 +8271,8 @@ msgstr "Запомнить выбор (опция \"svn.rmdir\")" msgid "Reminder: Commit your change after resolve" msgstr "Напоминание: Зафиксируйте ваши изменения после улаживания" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "Внешнее" @@ -8800,8 +8795,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9263,8 +9258,8 @@ msgid "Show" msgstr "Показать" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" -msgstr "Показать &ЖурналСсылок" +msgid "Show &RefLog" +msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, #. IDS_PROC_LOG_SHOWUNVERSIONED) @@ -9329,7 +9324,7 @@ msgstr "Показать непечатаемые знаки" #. Resource IDs: (Dialog IDD_CHANGEDFILES: Control id 1210) msgid "Show all &staged files" -msgstr "Показать все из&менённые файлы" +msgstr "Показать все &подготовленные файлы" #. Resource IDs: (ID_VIEW_SHOWALLTAGS - Menu) msgid "Show all tags" @@ -9436,8 +9431,8 @@ msgid "Show la&beled commits only" msgstr "Только со ссылками" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Показывать но&мера строк" +msgid "Show line number&s" +msgstr "Показать номер&а строк" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10154,7 +10149,7 @@ msgstr "Ветка \"%s\" является веткой внешнего хра #. Resource IDs: (IDS_ERR_PATCH_CHUNKMISMATCH) msgid "The chunk size did not match the number of added/removed lines!" -msgstr "Размер куска кода на соответствует количеству добавленных/удаленных строк!" +msgstr "Размер блока изменений не соответствует количеству добавленных/удаленных строк!" #. Resource IDs: (IDS_PROC_COMMITMESSAGE_EMPTY) msgid "The commit message must not be empty." @@ -10257,6 +10252,10 @@ msgstr "Файл слишком велик" msgid "The file is too large to open." msgstr "Файл слишком большой для открытия." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "Файл был изменён. Вы хотите сохранить изменения?" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10760,12 +10759,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "TortoiseGitBlame\n\nTortoiseGitBlame\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10886,8 +10885,8 @@ msgid "Trim right" msgstr "Обрезать справа" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" -msgstr "Доверять коду на выходе внешнего инструмента слияния для автоматического разрешения конфликтов." +msgid "Trust the exitcode of the external merge tool for auto resolving" +msgstr "Доверять коду выхода внешнего инструмента слияния для автоматического разрешения конфликтов" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." @@ -11135,8 +11134,8 @@ msgid "Use .mailmap" msgstr "Использовать .mailmap" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" -msgstr "Использовать Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" +msgstr "Использовать Git LFS (требуется только для Git < 2.15 и Git LFS < 2.3)" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) msgid "Use HTTP path component" @@ -11720,6 +11719,11 @@ msgstr "У вас уже установлена самая последняя в msgid "You asked to pull, but did not specify a remote branch." msgstr "Вы хотите получить, но не указали внешнюю ветвь." +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_sk.po b/Languages/Tortoise_sk.po index 0965f05a2..1f3ef4762 100644 --- a/Languages/Tortoise_sk.po +++ b/Languages/Tortoise_sk.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -14,7 +14,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Slovak (http://www.transifex.com/lznuaa/tortoisegit/language/sk/)\n" "MIME-Version: 1.0\n" @@ -1844,6 +1844,10 @@ msgstr "" msgid "Already up to date." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "" @@ -2111,10 +2115,6 @@ msgstr "Rozlišovať veľkosť písmen v menách autorov" msgid "Auto CrLf convert" msgstr "Automatická CrLf konverzia" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2141,6 +2141,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "Automatické dokončovanie slov (typicky tried a mien členov)\npočas písania správ denníka zo zmenených súborov." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "" @@ -2915,6 +2919,18 @@ msgstr "Farby podľa veku - &spojité" msgid "Colors" msgstr "Farby" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3191,6 +3207,14 @@ msgstr "Konflikty" msgid "Conflicts: %d" msgstr "Konflikty: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "" @@ -3313,9 +3337,9 @@ msgstr "Nemožno nájsť Super-projekt" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3546,6 +3570,10 @@ msgstr "Vytvorí súbor unifikovaného porovnania so všetkými zmenami, ktoré msgid "Creating pull-request..." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "" @@ -3864,6 +3892,18 @@ msgstr "Veľkosť a poloha dialógových okien" msgid "Dialogs" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Porovnať" @@ -3880,10 +3920,6 @@ msgstr "" msgid "Diff Viewer" msgstr "Prezerač rozdielov" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Prezerač rozdielov::Zlučovač" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Porovať pridané riadky" @@ -4373,7 +4409,7 @@ msgstr "" msgid "Either the name or IP of the proxy server" msgstr "IP adresa, alebo meno proxy servera" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "E-mail" @@ -5147,15 +5183,15 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5259,42 +5295,6 @@ msgstr "" msgid "General" msgstr "Všeobecné" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "Všeobecné::Farby 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "Všeobecné::Farby 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "Všeobecné::Farby 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Všeobecné::Kontextová ponuka" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "Všeobecné::Kontextová ponuka 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Všeobecné::Dialógy I" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Všeobecné::Dialógy II" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "General::Dialógy 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Získať denník zlučovania" @@ -5423,14 +5423,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5608,14 +5600,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Pripnuté (hook)skripty" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Pripnuté (hook)skripty::Integrácia so sledovačom prípadov" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Typ pripnutia" @@ -5887,12 +5871,8 @@ msgid "Icon Overlays" msgstr "Prekrytie ikon" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Prekrytie ikon::Sada ikon" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Prekrytie ikon::Popisovače" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6122,7 +6102,7 @@ msgid "Importing file %s" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6195,7 +6175,7 @@ msgstr "Vloží obsah schránky\nVlož" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6220,6 +6200,14 @@ msgstr "Chybná mena." msgid "Invalid revision number!" msgstr "Neplatné číslo revízie!" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6700,6 +6688,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "Reintegračné zlúčenie" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6871,10 +6863,6 @@ msgstr "Vnorené" msgid "Network" msgstr "Sieť" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Nový" @@ -7151,7 +7139,7 @@ msgstr "Poznámka: pokiaľ vyberiete obnoviť automaticky uložené súbory, mus #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7468,7 +7456,7 @@ msgid "Others" msgstr "Ostatný" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7487,6 +7475,10 @@ msgstr "" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "Prepísať" @@ -7911,14 +7903,11 @@ msgid "Proxy Settings" msgstr "Nastavenia Proxy" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "" @@ -8160,14 +8149,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8244,7 +8237,8 @@ msgstr "" msgid "Reminder: Commit your change after resolve" msgstr "" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "Vzdialený" @@ -8767,8 +8761,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9230,7 +9224,7 @@ msgid "Show" msgstr "Ukázať" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9403,8 +9397,8 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Zobraz &čísla riadkov" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10224,6 +10218,10 @@ msgstr "Súbor je príliš veľký" msgid "The file is too large to open." msgstr "Súbor je priveľký na otvorenie." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10727,12 +10725,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10853,7 +10851,7 @@ msgid "Trim right" msgstr "Orezať tabulátory a medzery z konca riadkov" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11102,7 +11100,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11687,6 +11685,11 @@ msgstr "Už máte nainštalovanú aktuálnu verziu." msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_sl.po b/Languages/Tortoise_sl.po index 161b49e2b..8763100fa 100644 --- a/Languages/Tortoise_sl.po +++ b/Languages/Tortoise_sl.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -10,8 +10,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: 2020-10-07 14:52+0000\n" -"Last-Translator: Marko Kotar \n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" +"Last-Translator: Sven Strickroth \n" "Language-Team: Slovenian (http://www.transifex.com/lznuaa/tortoisegit/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1840,6 +1840,10 @@ msgstr "" msgid "Already up to date." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "" @@ -2107,10 +2111,6 @@ msgstr "Pri imenih avtorjev upoštevaj velike/male črke" msgid "Auto CrLf convert" msgstr "" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2137,6 +2137,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "" +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "" @@ -2911,6 +2915,18 @@ msgstr "" msgid "Colors" msgstr "Barve" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3187,6 +3203,14 @@ msgstr "" msgid "Conflicts: %d" msgstr "Spori: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "" @@ -3309,9 +3333,9 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3542,6 +3566,10 @@ msgstr "Ustvari datoteko poenotene razlike z vsemi spremembami, ki ste jih oprav msgid "Creating pull-request..." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "" @@ -3860,6 +3888,18 @@ msgstr "Velikosti in položaji pogovornih oken" msgid "Dialogs" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Razlikuj" @@ -3876,10 +3916,6 @@ msgstr "" msgid "Diff Viewer" msgstr "Diff prikazovalnik" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Diff prikazovalnik::Merge orodje" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "" @@ -4369,7 +4405,7 @@ msgstr "" msgid "Either the name or IP of the proxy server" msgstr "Ime ali IP naslov prehoda" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "" @@ -5143,15 +5179,15 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5255,42 +5291,6 @@ msgstr "" msgid "General" msgstr "Splošno" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Splošno::Kontekstni meni" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Splošno::Pogovorna okna 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Splošno::Pogovorna okna 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Splošno::dialogi 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Priskrbi dnevnike spajanj" @@ -5419,14 +5419,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5604,14 +5596,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Ukazne datoteke akcij" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Ukazne datoteke akcij::Integracija sledilnika zadev" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Vrsta akcije" @@ -5883,12 +5867,8 @@ msgid "Icon Overlays" msgstr "Prekrivne ikone" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Prekrivanje ikon::Nabor ikon" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Načini prekrivanja ikon" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6118,7 +6098,7 @@ msgid "Importing file %s" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6191,7 +6171,7 @@ msgstr "Vstavi vsebino odložišča\nPrilepi" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6216,6 +6196,14 @@ msgstr "Napačna valuta." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6696,6 +6684,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "Vključitev veje" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6867,10 +6859,6 @@ msgstr "Ugnezdeno" msgid "Network" msgstr "Omrežje" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Nova" @@ -7147,7 +7135,7 @@ msgstr "Opozorilo - v primeru izbire avtomatske varnostne kopije, bo potrebno do #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7464,7 +7452,7 @@ msgid "Others" msgstr "Drugi" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7483,6 +7471,10 @@ msgstr "" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "" @@ -7907,14 +7899,11 @@ msgid "Proxy Settings" msgstr "Nastavitve prehoda" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "" @@ -8156,14 +8145,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8240,7 +8233,8 @@ msgstr "" msgid "Reminder: Commit your change after resolve" msgstr "" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "" @@ -8763,8 +8757,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9226,7 +9220,7 @@ msgid "Show" msgstr "Pokaži" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9399,8 +9393,8 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Pokaži &številke vrstic" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10220,6 +10214,10 @@ msgstr "Datoteka je prevelika" msgid "The file is too large to open." msgstr "Datoteka je prevelika za odpiranje." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10723,12 +10721,12 @@ msgstr "" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10849,7 +10847,7 @@ msgid "Trim right" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11098,7 +11096,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11683,6 +11681,11 @@ msgstr "Nameščeno imate zadnjo različico." msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_sq.po b/Languages/Tortoise_sq.po index 85131c6c2..6e4e5e46d 100644 --- a/Languages/Tortoise_sq.po +++ b/Languages/Tortoise_sq.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -14,7 +14,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: 2020-10-10 10:53+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Albanian (http://www.transifex.com/lznuaa/tortoisegit/language/sq/)\n" "MIME-Version: 1.0\n" @@ -1844,6 +1844,10 @@ msgstr "" msgid "Already up to date." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "" @@ -2111,10 +2115,6 @@ msgstr "" msgid "Auto CrLf convert" msgstr "" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2141,6 +2141,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "" +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "" @@ -2915,6 +2919,18 @@ msgstr "" msgid "Colors" msgstr "Ngjyrat" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3191,6 +3207,14 @@ msgstr "" msgid "Conflicts: %d" msgstr "Konfliktet: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "" @@ -3313,9 +3337,9 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3546,6 +3570,10 @@ msgstr "" msgid "Creating pull-request..." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "" @@ -3864,6 +3892,18 @@ msgstr "" msgid "Dialogs" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "" @@ -3880,10 +3920,6 @@ msgstr "Diff Two Commits" msgid "Diff Viewer" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "" @@ -4373,7 +4409,7 @@ msgstr "" msgid "Either the name or IP of the proxy server" msgstr "" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "Email" @@ -5147,15 +5183,15 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5259,42 +5295,6 @@ msgstr "" msgid "General" msgstr "Përgjithshëm" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Përgjithshëm::Dialogët 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Përgjithshëm::Dialogët 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "" @@ -5423,14 +5423,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "Git::Remote" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5608,14 +5600,6 @@ msgstr "" msgid "Hook Scripts" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "" @@ -5887,11 +5871,7 @@ msgid "Icon Overlays" msgstr "" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" +msgid "Icon Set" msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) @@ -6122,7 +6102,7 @@ msgid "Importing file %s" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6195,7 +6175,7 @@ msgstr "" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6220,6 +6200,14 @@ msgstr "Valutë e pavlerë. " msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6700,6 +6688,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6871,10 +6863,6 @@ msgstr "" msgid "Network" msgstr "Rrjeti" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "E Re" @@ -7151,7 +7139,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7468,7 +7456,7 @@ msgid "Others" msgstr "Tjera" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7487,6 +7475,10 @@ msgstr "" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "Mbishkruaj" @@ -7911,14 +7903,11 @@ msgid "Proxy Settings" msgstr "" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "" @@ -8160,14 +8149,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8244,7 +8237,8 @@ msgstr "" msgid "Reminder: Commit your change after resolve" msgstr "" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "" @@ -8767,8 +8761,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9230,7 +9224,7 @@ msgid "Show" msgstr "Shfaq" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9403,7 +9397,7 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" +msgid "Show line number&s" msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) @@ -10224,6 +10218,10 @@ msgstr "Skeda është shumë e madhe" msgid "The file is too large to open." msgstr "Skeda është shumë e madhe për tu hapur." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10727,12 +10725,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10853,7 +10851,7 @@ msgid "Trim right" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11102,7 +11100,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11687,6 +11685,11 @@ msgstr "" msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_sr@Cyrl.po b/Languages/Tortoise_sr@Cyrl.po index 3637d18cd..a494b150c 100644 --- a/Languages/Tortoise_sr@Cyrl.po +++ b/Languages/Tortoise_sr@Cyrl.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -13,7 +13,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Serbian (Cyrillic) (http://www.transifex.com/lznuaa/tortoisegit/language/sr@Cyrl/)\n" "MIME-Version: 1.0\n" @@ -1843,6 +1843,10 @@ msgstr "" msgid "Already up to date." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "" @@ -2110,10 +2114,6 @@ msgstr "Аутори по азбучном реду" msgid "Auto CrLf convert" msgstr "" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2140,6 +2140,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "" +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "" @@ -2914,6 +2918,18 @@ msgstr "Боје по старости, &континуално" msgid "Colors" msgstr "Боје" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3190,6 +3206,14 @@ msgstr "" msgid "Conflicts: %d" msgstr "Сукоби: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "Линије садржаја за закрпе" @@ -3312,9 +3336,9 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3545,6 +3569,10 @@ msgstr "Креира обједињени дифф фајл са свим из msgid "Creating pull-request..." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "" @@ -3863,6 +3891,18 @@ msgstr "Дијалог величина и позиције" msgid "Dialogs" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Разл" @@ -3879,10 +3919,6 @@ msgstr "" msgid "Diff Viewer" msgstr "Диф прегледач" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Диф прегледач::алат стапања" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Дифф додате линије" @@ -4372,7 +4408,7 @@ msgstr "" msgid "Either the name or IP of the proxy server" msgstr "Име или ИП прокси сервера" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "" @@ -5146,15 +5182,15 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5258,42 +5294,6 @@ msgstr "" msgid "General" msgstr "Уопштено" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Уопштено::Контекст мени" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Уопштено::Дијалози 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Уопштено::Дијалози 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Генерално::дијалози 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Узми дневнике стапања" @@ -5422,14 +5422,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5607,14 +5599,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Закачиве Скрипте" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Закачиве Скрипте::Проблем трагач интеграција" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Тип закачаљки" @@ -5886,12 +5870,8 @@ msgid "Icon Overlays" msgstr "Прекривне иконе" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Прекривне иконе::Скуп икона" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Прекривне иконе::Руковаоци икона" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6121,7 +6101,7 @@ msgid "Importing file %s" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6194,7 +6174,7 @@ msgstr "Уметни садржај клипборда\nЗалепи" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6219,6 +6199,14 @@ msgstr "Неисправна валута." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6699,6 +6687,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "Стопи Реинтегрирај (!?)" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6870,10 +6862,6 @@ msgstr "Угнеждено" msgid "Network" msgstr "Мрежа" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Ново" @@ -7150,7 +7138,7 @@ msgstr "Приметите да ако изаберете да вратите а #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7467,7 +7455,7 @@ msgid "Others" msgstr "Остали" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7486,6 +7474,10 @@ msgstr "" msgid "Output.prn" msgstr "Оутпут.прн" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "" @@ -7910,14 +7902,11 @@ msgid "Proxy Settings" msgstr "Поставке проксија" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "" @@ -8159,14 +8148,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8243,7 +8236,8 @@ msgstr "" msgid "Reminder: Commit your change after resolve" msgstr "" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "" @@ -8766,8 +8760,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9229,7 +9223,7 @@ msgid "Show" msgstr "Прикажи" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9402,8 +9396,8 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Прикажи бројеве лини&ја" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10223,6 +10217,10 @@ msgstr "фајл је превелик" msgid "The file is too large to open." msgstr "фајл је превелик да би се отворио." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10726,12 +10724,12 @@ msgstr "" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10852,7 +10850,7 @@ msgid "Trim right" msgstr "Подешен десно" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11101,7 +11099,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11686,6 +11684,11 @@ msgstr "Ви већ имате инсталирану најсвјежију в msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_sr@latin.po b/Languages/Tortoise_sr@latin.po index f458f001a..54c57dfb4 100644 --- a/Languages/Tortoise_sr@latin.po +++ b/Languages/Tortoise_sr@latin.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -19,7 +19,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Serbian (Latin) (http://www.transifex.com/lznuaa/tortoisegit/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -1849,6 +1849,10 @@ msgstr "Dozvoljava kreiranje praznog ureza koji sadrži samo poruku bez datoteka msgid "Already up to date." msgstr "Već je ažurno." +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "" @@ -2116,10 +2120,6 @@ msgstr "Autori po azbučnom redu" msgid "Auto CrLf convert" msgstr "" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2146,6 +2146,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "Za vreme upisa poruke dnevnika automatska dopuna predlaže reči\n(obično imena klasa ili članova) iz fajlova koje ste promenili." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "Automatski učitaj Putty &Ključ" @@ -2920,6 +2924,18 @@ msgstr "Boje po starosti, &kontinualno" msgid "Colors" msgstr "Boje" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3196,6 +3212,14 @@ msgstr "" msgid "Conflicts: %d" msgstr "Sukobi: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "Linije sadržaja za zakrpe" @@ -3318,9 +3342,9 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3551,6 +3575,10 @@ msgstr "Kreira objedinjeni diff fajl sa svim izmenama koje ste napravili" msgid "Creating pull-request..." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "" @@ -3869,6 +3897,18 @@ msgstr "Dijalog veličina i pozicije" msgid "Dialogs" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Razl" @@ -3885,10 +3925,6 @@ msgstr "" msgid "Diff Viewer" msgstr "Dif pregledač" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Dif pregledač::alat stapanja" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Diff dodate linije" @@ -4378,7 +4414,7 @@ msgstr "" msgid "Either the name or IP of the proxy server" msgstr "Ime ili IP proksi servera" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "" @@ -5152,15 +5188,15 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5264,42 +5300,6 @@ msgstr "" msgid "General" msgstr "Opšte" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "Opšte::Boje 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "Opšte::Boje 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "Opšte::Boje 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Opšte::Kontekst meni" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "Opšte::Kontekst meni 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Opšte::Dijalozi 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Opšte::Dijalozi 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Opšte::Dijalozi 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Uzmi dnevnike stapanja" @@ -5428,14 +5428,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5613,14 +5605,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Zakačive Skripte" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Zakačive Skripte::Problem tragač integracija" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Tip zakačaljki" @@ -5892,12 +5876,8 @@ msgid "Icon Overlays" msgstr "Prekrivne ikone" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Prekrivne ikone::Skup ikona" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Prekrivne ikone::Rukovaoci ikona" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6127,7 +6107,7 @@ msgid "Importing file %s" msgstr "Uvozim datoteku %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6200,7 +6180,7 @@ msgstr "Umetni sadržaj klipborda\nZalepi" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6225,6 +6205,14 @@ msgstr "Neispravna valuta." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6705,6 +6693,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "Stopi Reintegriraj (!?)" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6876,10 +6868,6 @@ msgstr "Ugneždeno" msgid "Network" msgstr "Mreža" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Novo" @@ -7156,7 +7144,7 @@ msgstr "Primetite da ako izaberete da vratite auto-sačuvana dokumenta, morate e #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7473,7 +7461,7 @@ msgid "Others" msgstr "Ostali" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7492,6 +7480,10 @@ msgstr "" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "" @@ -7916,14 +7908,11 @@ msgid "Proxy Settings" msgstr "Postavke proksija" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "Povuci" @@ -8165,14 +8154,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8249,7 +8242,8 @@ msgstr "" msgid "Reminder: Commit your change after resolve" msgstr "" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "" @@ -8772,8 +8766,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9235,7 +9229,7 @@ msgid "Show" msgstr "Prikaži" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9408,8 +9402,8 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Prikaži brojeve lini&ja" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10229,6 +10223,10 @@ msgstr "fajl je prevelik" msgid "The file is too large to open." msgstr "fajl je prevelik da bi se otvorio." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10732,12 +10730,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10858,7 +10856,7 @@ msgid "Trim right" msgstr "Podešen desno" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11107,7 +11105,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11692,6 +11690,11 @@ msgstr "Vi već imate instaliranu najsvježiju verziju." msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_sv.po b/Languages/Tortoise_sv.po index a8d1ad6c4..b1291b67a 100644 --- a/Languages/Tortoise_sv.po +++ b/Languages/Tortoise_sv.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -26,7 +26,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Swedish (http://www.transifex.com/lznuaa/tortoisegit/language/sv/)\n" "MIME-Version: 1.0\n" @@ -1856,6 +1856,10 @@ msgstr "Tillåter skapande av en tom arkivering som bara har ett arkiveringsmedd msgid "Already up to date." msgstr "Redan uppdaterad." +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "Pusha alltid till det valda fjärrarkivet för denna lokala gren" @@ -2123,10 +2127,6 @@ msgstr "Hantera användarnamn skiftlägesokänsligt" msgid "Auto CrLf convert" msgstr "Automatisk CrLf konvertering" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2153,6 +2153,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "Automatisk ifyllning föreslår ord (vanligtvis klass- eller medlemsnamn),\nfrån filer som har ändrats, medans du skriver loggmeddelanden." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "Auto-laddning av Putty-&nyckel" @@ -2927,6 +2931,18 @@ msgstr "Färg visar ålder, &flytande" msgid "Colors" msgstr "Färger" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3203,6 +3219,14 @@ msgstr "Konflikter" msgid "Conflicts: %d" msgstr "Konflikter: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "Omgivande rader för patchar" @@ -3325,9 +3349,9 @@ msgstr "Kunde inte hitta super-projektet" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3558,6 +3582,10 @@ msgstr "Skapar en patchfil med dina ändringar i \"Unified Diff\"-format" msgid "Creating pull-request..." msgstr "Skapar Pull-begäran" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "Inloggningshanterare får inte lämnas tom." @@ -3876,6 +3904,18 @@ msgstr "Storlek och positioner för dialoger" msgid "Dialogs" msgstr "Dialoger" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Jämför" @@ -3892,10 +3932,6 @@ msgstr "Jämför två arkiveringar" msgid "Diff Viewer" msgstr "Visa jämförelse" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Visa jämförelse::Merge Tool" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Diff adderade rader" @@ -4385,7 +4421,7 @@ msgstr "Effektiv" msgid "Either the name or IP of the proxy server" msgstr "Ange antingen namnet på eller IP-adressen till proxyservern." -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "Email" @@ -5159,15 +5195,15 @@ msgstr "Framåt %d" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5271,42 +5307,6 @@ msgstr "Sammanställer statistik" msgid "General" msgstr "Allmänt" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "Allmänt::Alternativ editor" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "Allmänt::Färger 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "Allmänt::Färger 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "Allmänt::Färger 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Allmänt::Snabbmeny" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "Allmänt::Snabbmeny 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Allmänt::Dialoger 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Allmänt::Dialoger 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Allmänt::Dialoger 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Hämta föreningsloggar" @@ -5435,14 +5435,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "Git använder ett koncept med hierarkisk konfiguration.\nDet betyder att det finns inställningar på flera nivåer; en högre nivå överrider inställningar på en lägre nivå.\nKnappen \"Effektiv\" visar de värden som gäller för nuvarande område (skrivskyddat).\nVälj valfri nivå för att se vilka värden som är konfigurerat där.\nFör att ändra en inställning, välj en nivå, skriv in värdet och välj var du vill spara det." -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "Git::Inloggningshanterare" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "Git::Fjärrarkiv" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5620,14 +5612,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Krokskript" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "Krokskript::Konfiguration av ärendespårning" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Krokskript::Integration av Ärendespårning" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Kroktyp" @@ -5899,12 +5883,8 @@ msgid "Icon Overlays" msgstr "Statusikoner" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Statusikoner::Ikonuppsättning" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Statusikoner::Hanterare för statusikoner" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6134,8 +6114,8 @@ msgid "Importing file %s" msgstr "Importerar fil %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" -msgstr "Inkommande ändringslista" +msgid "In Changelist" +msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) msgid "In Commits" @@ -6207,7 +6187,7 @@ msgstr "Infoga innehåll från urklipp\nKlista in" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6232,6 +6212,14 @@ msgstr "Ogiltig valuta. " msgid "Invalid revision number!" msgstr "Ogiltigt revisionsnummer!" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6712,6 +6700,10 @@ msgstr "Punkt för förening" msgid "Merge Reintegrate" msgstr "Återintegrera" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6883,10 +6875,6 @@ msgstr "Nestlad" msgid "Network" msgstr "Nätverk" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "Nätverk::Email" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Ny" @@ -7163,7 +7151,7 @@ msgstr "Notera att om du väljer att återställa automatiskt sparade doument s #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7480,8 +7468,8 @@ msgid "Others" msgstr "Andras" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" -msgstr "Utåtgående ändringslista" +msgid "Out Changelist" +msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) msgid "Out Commits" @@ -7499,6 +7487,10 @@ msgstr "Destination" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "Skriv över" @@ -7923,14 +7915,11 @@ msgid "Proxy Settings" msgstr "Inställningar för proxy" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "Prune (Alla fjärrarkiv)" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "Pull" @@ -8172,14 +8161,18 @@ msgid "Ref List" msgstr "Ref List" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" -msgstr "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" +msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "RefLog" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8256,7 +8249,8 @@ msgstr "Kom ihåg mitt val (\"svn.rmdir\" option)" msgid "Reminder: Commit your change after resolve" msgstr "Kom ihåg: Arkivera dina ändringar efter att du löst konflikterna" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "Fjärrarkiv" @@ -8779,8 +8773,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9242,8 +9236,8 @@ msgid "Show" msgstr "Visa" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" -msgstr "Visa &Reflogg" +msgid "Show &RefLog" +msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, #. IDS_PROC_LOG_SHOWUNVERSIONED) @@ -9415,8 +9409,8 @@ msgid "Show la&beled commits only" msgstr "Visa bara arkiveringar med etiketter" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Visa radnumme&r" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10236,6 +10230,10 @@ msgstr "Filen är för stor" msgid "The file is too large to open." msgstr "Filen är för stor för att öppna." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10739,12 +10737,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10865,7 +10863,7 @@ msgid "Trim right" msgstr "Trimma höger" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11114,7 +11112,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11699,6 +11697,11 @@ msgstr "Du har redan den senaste versionen installerad." msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_tr.po b/Languages/Tortoise_tr.po index e4feaba45..a5bd9383a 100644 --- a/Languages/Tortoise_tr.po +++ b/Languages/Tortoise_tr.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -49,7 +49,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Turkish (http://www.transifex.com/lznuaa/tortoisegit/language/tr/)\n" "MIME-Version: 1.0\n" @@ -1879,6 +1879,10 @@ msgstr "" msgid "Already up to date." msgstr "Zaten güncel." +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "" @@ -2146,10 +2150,6 @@ msgstr "Yazarlar büyük-küçük harfe duyarlı" msgid "Auto CrLf convert" msgstr "Kendiliğinden CrLf dönüşümü" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2176,6 +2176,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "" +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "Putty &Anahtarını Kendiliğinden Yükle" @@ -2950,6 +2954,18 @@ msgstr "Renk yaşına göre, devamlı" msgid "Colors" msgstr "Renk" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3226,6 +3242,14 @@ msgstr "Çakışmalar" msgid "Conflicts: %d" msgstr "Çakışmalar: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "Yamalar için bağlam satırları" @@ -3348,9 +3372,9 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3581,6 +3605,10 @@ msgstr "Yaptığınız tüm değişikliklerle birleştirilmiş bir karşılaşt msgid "Creating pull-request..." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "" @@ -3899,6 +3927,18 @@ msgstr "Diyalog boyutları ve konumları" msgid "Dialogs" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Fark" @@ -3915,10 +3955,6 @@ msgstr "İki Teslimi Karşılaştır" msgid "Diff Viewer" msgstr "Dosya Fark Görüntüleyicisi" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "" @@ -4408,7 +4444,7 @@ msgstr "" msgid "Either the name or IP of the proxy server" msgstr "Proxy sunucusunun ismini yada IP'sini giriniz" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "ePosta" @@ -5182,15 +5218,15 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5294,42 +5330,6 @@ msgstr "" msgid "General" msgstr "Genel" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "Genel::Renk 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "Genel::Renk 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "Genel::Renk 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Genel::İçerik Menüsü" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "Genel::İçerik Menüsü 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Genel::Diyalog Ayarları 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Genel::Diyalog Ayarları 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Genel::Diyalog Ayarları 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Birleşme günlüklerini getir" @@ -5458,14 +5458,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5643,14 +5635,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Yakalayıcı Komut-Dosyaları" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Yakalayıcı Komut-Dosyaları::Sorun Takip Entegrasyonu" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Yakalayıcı türü" @@ -5922,12 +5906,8 @@ msgid "Icon Overlays" msgstr "Simge Ayarları" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Simge Ayarları::Simge Seti" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Simge Ayarları::Simge Seti" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6157,7 +6137,7 @@ msgid "Importing file %s" msgstr "Dosyayı %s'a içe aktar" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6230,7 +6210,7 @@ msgstr "Pano içeriğini ekle\nYapıştır" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6255,6 +6235,14 @@ msgstr "Geçersiz Para Birimi." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6735,6 +6723,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "Yeniden Entegre Ederek Birleştir" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6906,10 +6898,6 @@ msgstr "İçiçe yerleştirilmiş" msgid "Network" msgstr "Ağ Ayarları" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "Ağ Ayarları::E-Posta" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Yeni" @@ -7186,7 +7174,7 @@ msgstr "Otomatik kaydedilen belgeleri geri döndürmeyi seçerseniz, orjinal bel #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7503,7 +7491,7 @@ msgid "Others" msgstr "Diğerleri" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7522,6 +7510,10 @@ msgstr "Çıktı Dizini" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "" @@ -7946,14 +7938,11 @@ msgid "Proxy Settings" msgstr "Proxy Ayarları" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "Çek" @@ -8195,14 +8184,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8279,7 +8272,8 @@ msgstr "" msgid "Reminder: Commit your change after resolve" msgstr "" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "Uzaktaki" @@ -8802,8 +8796,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9265,7 +9259,7 @@ msgid "Show" msgstr "Göster" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9438,8 +9432,8 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Satır numaralarasını/larını &s goster" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10259,6 +10253,10 @@ msgstr "Dosya çok büyük" msgid "The file is too large to open." msgstr "Dosya açmak için çok büyük." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10762,12 +10760,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10888,7 +10886,7 @@ msgid "Trim right" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11137,7 +11135,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11722,6 +11720,11 @@ msgstr "Sizde zaten en son versiyon yüklenmiş durumda." msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_uk.po b/Languages/Tortoise_uk.po index 9b34ae9f3..cdb0667e1 100644 --- a/Languages/Tortoise_uk.po +++ b/Languages/Tortoise_uk.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -28,7 +28,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Ukrainian (http://www.transifex.com/lznuaa/tortoisegit/language/uk/)\n" "MIME-Version: 1.0\n" @@ -1858,6 +1858,10 @@ msgstr "Дозволяє створювати порожній внесок що msgid "Already up to date." msgstr "Вже оновлено." +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "" @@ -2125,10 +2129,6 @@ msgstr "Автори чутливі до регістра" msgid "Auto CrLf convert" msgstr "Конвертувати CrLf автоматично" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Auto Crlf:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2155,6 +2155,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "Автодоповнення під час набору повідомлення логу пропонує слова\n(звично імена класів або членів) зі змінених вами файлів." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "Автоматично завантажувати ключ Putty" @@ -2929,6 +2933,18 @@ msgstr "" msgid "Colors" msgstr "Кольори" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3205,6 +3221,14 @@ msgstr "Конфлікти" msgid "Conflicts: %d" msgstr "Конфлікти: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "" @@ -3327,9 +3351,9 @@ msgstr "Не вдалося знайти Супер-проект" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3560,6 +3584,10 @@ msgstr "Створює файл об'єднаних відмінностей з msgid "Creating pull-request..." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "" @@ -3878,6 +3906,18 @@ msgstr "Розміри та розташування діалогів" msgid "Dialogs" msgstr "Діалоги" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Відмінності (Diff)" @@ -3894,10 +3934,6 @@ msgstr "Порівняти Два Внески" msgid "Diff Viewer" msgstr "Переглядач Diff" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Переглядач Diff::Інструмент злиття" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "Diff додані строки" @@ -4387,7 +4423,7 @@ msgstr "Поточні" msgid "Either the name or IP of the proxy server" msgstr "Ім'я або ж IP проксі-сервера" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "Email" @@ -5161,15 +5197,15 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5273,42 +5309,6 @@ msgstr "Збір статистики" msgid "General" msgstr "Загальне" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "Загальне::Альтернативний редактор" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "Загальне::Кольори 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "Загальне::Кольори 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "Загальне::Кольори 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Загальне::Контекстне меню" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "Загальне::Контекстне меню 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Загальне::Діалоги 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Загальне::Діалоги 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Загальне::Діалоги 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Отримати логи злиття" @@ -5437,14 +5437,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "Git використовуе концепцію ієрархічної конфігурації.\nТ.е. декілька рівнів, налаштування у більш високих уровнях перекривають значення у низьких уровнях.\nВкладка \"Поточні\" відображае поточні значення для вибранного об'ему (тільки читання).\nВиберіть будьякий рівень щоб побачити значення збереженні на ньому.\nЩоб змінити налаштування, виберіть рівень, введіть значення, та виберіть де його зберігти." -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "Git::Рекомендації" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "Git::Віддалений" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5622,14 +5614,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Скрипти зачіпок" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "Скрипти зачіпок::Налаштування обліку проблем (Issue Tracker)" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Скрипти зачіпок::Інтеграція обліку проблем (Issue Tracker)" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Тип зачіпки" @@ -5901,12 +5885,8 @@ msgid "Icon Overlays" msgstr "Перекривання піктограм" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Перекривання піктограм::Набір піктограм" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Перекривання піктограм::Overlay Handlers" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6136,7 +6116,7 @@ msgid "Importing file %s" msgstr "Імпортувати %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6209,7 +6189,7 @@ msgstr "Вставити вміст буфера обміну\nВклеїти" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6234,6 +6214,14 @@ msgstr "Неправильна грошова одиниця." msgid "Invalid revision number!" msgstr "Невірний номер ревізії!" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6714,6 +6702,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "Злити переінтегрування" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6885,10 +6877,6 @@ msgstr "Вкладено" msgid "Network" msgstr "Мережа" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "Мережа::Email" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Новий" @@ -7165,7 +7153,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7482,7 +7470,7 @@ msgid "Others" msgstr "Інші" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7501,6 +7489,10 @@ msgstr "Вихідна тека" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "Перезаписати" @@ -7925,14 +7917,11 @@ msgid "Proxy Settings" msgstr "Налаштування проксі" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "" @@ -8174,14 +8163,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8258,7 +8251,8 @@ msgstr "" msgid "Reminder: Commit your change after resolve" msgstr "" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "Віддалено" @@ -8781,8 +8775,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9244,7 +9238,7 @@ msgid "Show" msgstr "Показати" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9417,8 +9411,8 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Показати &номери рядків" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10238,6 +10232,10 @@ msgstr "Файл занадто великий" msgid "The file is too large to open." msgstr "Файл надто великий, щоб його відкрити ." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10741,12 +10739,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10867,7 +10865,7 @@ msgid "Trim right" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11116,7 +11114,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11701,6 +11699,11 @@ msgstr "У вас уже встановлено найновішу версію. msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_vi.po b/Languages/Tortoise_vi.po index f94860c97..ba9e58b90 100644 --- a/Languages/Tortoise_vi.po +++ b/Languages/Tortoise_vi.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -15,7 +15,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Vietnamese (http://www.transifex.com/lznuaa/tortoisegit/language/vi/)\n" "MIME-Version: 1.0\n" @@ -1845,6 +1845,10 @@ msgstr "" msgid "Already up to date." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "" @@ -2112,10 +2116,6 @@ msgstr "Các tác giả có phân biệt chữ thường và hoa" msgid "Auto CrLf convert" msgstr "Tự động chuyển đổi CrLf" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "Crlf tự động:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "" @@ -2142,6 +2142,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "Tự động điền đủ cho những từ gợi ý (thường là lớp hoặc tên thành viên)\ntừ các tập tin bạn đã thay đổi khi bạn gõ vào thông điệp tường trình." +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "Tự động tải &khóa Putty" @@ -2916,6 +2920,18 @@ msgstr "Tô màu theo tuổi, &liên tục" msgid "Colors" msgstr "Các màu" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3192,6 +3208,14 @@ msgstr "" msgid "Conflicts: %d" msgstr "Mâu thuẫn: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "" @@ -3314,9 +3338,9 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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\"." +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) @@ -3547,6 +3571,10 @@ msgstr "Tạo tập tin chứa khác biệt thống nhất với tất cả thay msgid "Creating pull-request..." msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "" @@ -3865,6 +3893,18 @@ msgstr "Kích thước và vị trí của hộp thoại" msgid "Dialogs" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "Tìm Khác Biệt" @@ -3881,10 +3921,6 @@ msgstr "" msgid "Diff Viewer" msgstr "Trình xem Khác biệt" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "Trình xem Khác biệt::Công Cụ Hợp Nhất" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "" @@ -4374,7 +4410,7 @@ msgstr "" msgid "Either the name or IP of the proxy server" msgstr "Tên hoặc IP của máy chủ proxy" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "" @@ -5148,15 +5184,15 @@ msgstr "" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) @@ -5260,42 +5296,6 @@ msgstr "" msgid "General" msgstr "Tổng quát" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "Tổng quát::Màu 1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "Tổng quát::Màu 2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "Tổng quát::Màu 3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "Tổng quát::Thực đơn ngữ cảnh" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "Tổng quát::Thực đơn ngữ cảnh 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "Tổng quát::Hộp thoại 1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "Tổng quát::Hộp thoại 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "Tổng quát::Hộp thoại 3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "Lấy các tường trình hợp nhất" @@ -5424,14 +5424,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5609,14 +5601,6 @@ msgstr "" msgid "Hook Scripts" msgstr "Kịch bản móc" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Kịch bản móc::Tích hợp bộ theo dõi vấn đề" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Kiểu móc" @@ -5888,12 +5872,8 @@ msgid "Icon Overlays" msgstr "Biểu tượng nạp chồng" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "Biểu tượng nạp chồng::Tập hợp biểu tượng" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "Biểu tượng nạp chồng::Xử lý nạp chồng" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6123,7 +6103,7 @@ msgid "Importing file %s" msgstr "Đang nhập dữ liệu từ tập tin %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" +msgid "In Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) @@ -6196,7 +6176,7 @@ msgstr "Chèn nội dung vào Clipboard\nDán" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6221,6 +6201,14 @@ msgstr "Tiền tệ không hợp lệ" msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "" @@ -6701,6 +6689,10 @@ msgstr "" msgid "Merge Reintegrate" msgstr "Tái tích hợp cho hợp nhật" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6872,10 +6864,6 @@ msgstr "Lồng ghép" msgid "Network" msgstr "Mạng" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "Mới" @@ -7152,7 +7140,7 @@ msgstr "Nhớ rằng nếu bạn chọn phục hồi các tài liệu tự độ #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7469,7 +7457,7 @@ msgid "Others" msgstr "Khác" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7488,6 +7476,10 @@ msgstr "" msgid "Output.prn" msgstr "Output.pm" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "" @@ -7912,14 +7904,11 @@ msgid "Proxy Settings" msgstr "Thiết lập Proxy" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "Kéo" @@ -8161,14 +8150,18 @@ msgid "Ref List" msgstr "" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "" @@ -8245,7 +8238,8 @@ msgstr "" msgid "Reminder: Commit your change after resolve" msgstr "" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "Từ xa" @@ -8768,8 +8762,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "Safe Crlf:" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9231,7 +9225,7 @@ msgid "Show" msgstr "Hiển thị" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9404,8 +9398,8 @@ msgid "Show la&beled commits only" msgstr "" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "Hiển thị số thứ tự &dòng" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10225,6 +10219,10 @@ msgstr "Tập tin quá lớn" msgid "The file is too large to open." msgstr "Tập tin quá lớn để mở." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10728,12 +10726,12 @@ msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10854,7 +10852,7 @@ msgid "Trim right" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11103,7 +11101,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) @@ -11688,6 +11686,11 @@ msgstr "Bạn đã có phiên bản mới nhất cài đặt." msgid "You asked to pull, but did not specify a remote branch." msgstr "" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" diff --git a/Languages/Tortoise_zh_CN.po b/Languages/Tortoise_zh_CN.po index b8d507611..0ceec6f69 100644 --- a/Languages/Tortoise_zh_CN.po +++ b/Languages/Tortoise_zh_CN.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -13,7 +13,7 @@ # Garfield Yao , 2011 # Gones , 2013 # Gong Gong , 2013 -# liushuyu011 , 2014,2016 +# shuyu liu , 2014,2016 # loveyu , 2012 # Lübbe Onken , 2011,2013 # lznuaa , 2013-2014,2017 @@ -25,7 +25,7 @@ # RAMBOO , 2013 # RAMBOO , 2013 # Shengbin Meng , 2013 -# liushuyu011 , 2014,2016 +# shuyu liu , 2014,2016 # Sven Strickroth , 2012-2013,2017-2019 # szkingrose <1072258106@qq.com>, 2014 # Verplusor, 2011 @@ -34,7 +34,7 @@ # xiaobing chen , 2016 # Xijian Yan, 2018 # XY <1642787610@qq.com>, 2020 -# YFdyh000 , 2013,2016,2019-2020 +# YFdyh000 , 2013,2016,2019-2021 # YFdyh000 , 2013,2016 # YFdyh000 , 2013-2018 # zhang chuan , 2011 @@ -44,8 +44,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: 2020-10-07 09:37+0000\n" -"Last-Translator: Sven Strickroth \n" +"PO-Revision-Date: 2021-03-19 19:23+0000\n" +"Last-Translator: YFdyh000 \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" @@ -1874,6 +1874,10 @@ msgstr "允许创建只有提交信息而没有文件的空提交（即 git comm msgid "Already up to date." msgstr "已经最新" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "替代编辑器" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "总是推送这个本地分支到选择的远端归档" @@ -2141,10 +2145,6 @@ msgstr "作者区分大小写" msgid "Auto CrLf convert" msgstr "自动CrLf换行符转换" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "自动CrLf转换:" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "自动&CrLf:" @@ -2171,6 +2171,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "自动完成建议的字符（通常是类名或成员名）\n它来自于您已经更改的文件，作为您输入的日志信息。" +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "自动换行符:" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "自动加载 Putty 密钥(&K)" @@ -2945,6 +2949,18 @@ msgstr "依据年龄标记颜色，连续的(&C)" msgid "Colors" msgstr "颜色" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "颜色一" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "颜色二" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "颜色三" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3221,6 +3237,14 @@ msgstr "冲突" msgid "Conflicts: %d" msgstr "冲突: %d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "右键菜单" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "右键菜单二" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "补丁的上下文行数" @@ -3343,10 +3367,10 @@ msgstr "不能找到父工程" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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 "git.exe 的版本字符串中未找到 \"msysgit\" 或 \"windows\"。\n如果您在使用的为 cygwin 或 msys2 环境的 git，您需要启用特殊处理。\n您可以在帮助文件中查阅 \"cygwin git\" 或 \"msys2 git\" 了解更多信息。" +"Could not find \"msysgit\" or \"windows\" in version string 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 "git.exe 的版本字符串中未找到 \"msysgit\" 或 \"windows\"。\n如果您在使用的为 Cygwin 或 MSYS2 环境的 git，您需要启用特殊处理。\n您可以在帮助文件中查阅 \"Cygwin git\" 或 \"MSYS2 git\" 了解更多信息。" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) #, c-format @@ -3576,6 +3600,10 @@ msgstr "创建包含有您做出的所有更改的标准差异文件" msgid "Creating pull-request..." msgstr "正在创建拉取请求..." +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "凭证" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "凭证助手不能为空。" @@ -3894,6 +3922,18 @@ msgstr "窗口大小及位置" msgid "Dialogs" msgstr "对话框" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "对话框组一" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "对话框组二" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "对话框组三" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "差异" @@ -3910,10 +3950,6 @@ msgstr "比较两个版本差异" msgid "Diff Viewer" msgstr "差异查看器" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "差异查看器::合并工具" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "差异-添加的行" @@ -4403,7 +4439,7 @@ msgstr "实际生效" msgid "Either the name or IP of the proxy server" msgstr "代理服务器的名称或 IP 地址" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "Email" @@ -5177,16 +5213,16 @@ msgstr "向前 %d" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." -msgstr "在 git.exe 的版本字符串找到 \"msysgit\" 或 \"windows\"，但您已启用对 git.exe 的特殊处理。这些特殊处理必须禁用才能正确配合 Git for Windows 运作！\n您可以在帮助文件中查阅 \"cygwin git\" 或 \"msys2 git\" 了解更多信息。" +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." +msgstr "在 git.exe 的版本字符串找到 \"msysgit\" 或 \"windows\"，但您已启用对 git.exe 的特殊处理。\n这些特殊处理必须禁用才能正确配合 Git for Windows 运作！\n您可以在帮助文件中查阅 \"Cygwin git\" 或 \"MSYS2 git\" 了解更多信息。" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." -msgstr "发现一个锁文件，它表示 TortoiseGit 变基流程正在运行。这阻止了此操作。\n\n如果您并且正在运行 TortoiseGit 变基流程，您可以移除陈旧的锁文件以继续操作。" +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +msgstr "发现一个锁文件，它表示 TortoiseGit 变基流程正在运行。这阻止了此操作。\n\n如果您并无运行 TortoiseGit 变基流程，则可以移除残留的锁文件以继续操作。" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) msgid "" @@ -5289,42 +5325,6 @@ msgstr "正在收集统计信息" msgid "General" msgstr "常规设置" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "常规设置::编辑器" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "常规设置::颜色一" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "常规设置::颜色二" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "常规设置::颜色三" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "常规设置::右键菜单" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "常规设置::右键菜单二" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "常规设置::对话框组一" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "常规设置::对话框组二" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "常规设置::对话框组三" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "获取合并日志" @@ -5453,14 +5453,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "Git 采用分层次的配置结构。\n即配置有多个层次，高层次的设置会覆盖低层次的设置。\n“实际生效”选项卡显示了您在当前范围的有效值（只读状态）。\n选择任意层次可查看存储在那里的值。\n选择要更改设置的一个层次，然后输入或选择要存储的值。" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "Git::凭证" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "Git::远端" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5638,14 +5630,6 @@ msgstr "提示：最近使用过的提交消息可通过文本框的右键菜单 msgid "Hook Scripts" msgstr "Hook 脚本" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "Hook 脚本::问题跟踪器配置" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "Hook 脚本::问题跟踪器集成" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "Hook 类型" @@ -5917,12 +5901,8 @@ msgid "Icon Overlays" msgstr "图标覆盖" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "图标覆盖::图标集" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "图标覆盖::覆盖处理器" +msgid "Icon Set" +msgstr "图标集" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6152,8 +6132,8 @@ msgid "Importing file %s" msgstr "正在导入文件 %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" -msgstr "在修改列表中" +msgid "In Changelist" +msgstr "将传入的变更" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) msgid "In Commits" @@ -6225,7 +6205,7 @@ msgstr "插入剪贴板内容\n粘贴" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "不将新创建的 HEAD 指向所克隆仓库的 HEAD 指向的分支，改为指向特定分支。" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6250,6 +6230,14 @@ msgstr "非法货币。" msgid "Invalid revision number!" msgstr "无效的修订版本号！" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "问题跟踪器配置" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "问题跟踪器集成" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "签发者：" @@ -6730,6 +6718,10 @@ msgstr "合并点" msgid "Merge Reintegrate" msgstr "合并复兴分支" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "合并工具" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6901,10 +6893,6 @@ msgstr "嵌套" msgid "Network" msgstr "网络" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "网络::邮件" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "新增" @@ -7181,7 +7169,7 @@ msgstr "如果您选择恢复自动保存的文档，您必须明确地将它们 #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "注意：这些设置也适用于“补丁查看器”对话框。\n要选择是否要使用内置的或任何其他差异查看器程序，请转到左侧树中的“差异查看器”首选项部分。" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7498,7 +7486,7 @@ msgid "Others" msgstr "对方的" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" +msgid "Out Changelist" msgstr "将推送的变更" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) @@ -7517,6 +7505,10 @@ msgstr "输出目录" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "覆盖处理器" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "覆盖" @@ -7941,14 +7933,11 @@ msgid "Proxy Settings" msgstr "代理服务器设置" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "修剪" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "修剪 (prune)（所有远端）" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "拉取(Pull)" @@ -8190,14 +8179,18 @@ msgid "Ref List" msgstr "引用列表" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" msgstr "浏览引用" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "引用记录" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "引用浏览器" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "显示所有包含此提交的分支" @@ -8274,7 +8267,8 @@ msgstr "记住选择 (\"svn.rmdir\"选项)" msgid "Reminder: Commit your change after resolve" msgstr "提醒：请在冲突解决后提交您的变更" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "远端" @@ -8797,8 +8791,8 @@ msgid "Sa&feCrLf:" msgstr "检查换行符(&F):" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "检查换行符:" +msgid "SafeCrLf:" +msgstr "安全换行符:" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9260,7 +9254,7 @@ msgid "Show" msgstr "显示" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" +msgid "Show &RefLog" msgstr "显示引用记录(&R)" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, @@ -9433,7 +9427,7 @@ msgid "Show la&beled commits only" msgstr "仅显示有块状标签的提交(&B)" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" +msgid "Show line number&s" msgstr "显示行号(&S)" #. Resource IDs: (IDS_MENULFSLOCKS) @@ -10254,6 +10248,10 @@ msgstr "文件过大" msgid "The file is too large to open." msgstr "文件过大，无法打开。" +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "文件已修改，是否保存更改？" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10757,12 +10755,12 @@ msgstr "TortoiseGitBlame，版本 %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "TortoiseGitBlame\n\nTortoiseGitBlame\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10883,7 +10881,7 @@ msgid "Trim right" msgstr "去掉行尾空格" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" +msgid "Trust the exitcode of the external merge tool for auto resolving" msgstr "信任并解析外部合并工具的退出码（exitcode）" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) @@ -11132,8 +11130,8 @@ msgid "Use .mailmap" msgstr "使用 .mailmap" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" -msgstr "使用 Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" +msgstr "使用 Git LFS（仅当 Git < 2.15 且 Git LFS < 2.3 时必须）" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) msgid "Use HTTP path component" @@ -11568,7 +11566,7 @@ msgstr "在应用补丁时，如必要，忽略上下文行的空白变更" msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" -msgstr "当关闭一个正在运行 git 进程的进度对话框时，在关闭前要求确认" +msgstr "关闭一个正在运行 git 进程的进度对话框时，终止前要求确认" #. Resource IDs: (IDS_SETTINGS_ENABLEDRAGCONTEXTMENU_TT) msgid "" @@ -11717,6 +11715,11 @@ msgstr "您已经安装了最新版本。" msgid "You asked to pull, but did not specify a remote branch." msgstr "您要求拉取，但没有指定远程分支。" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "您可以在 Git 设置页面上针对所有远端或全局配置。" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" @@ -12136,15 +12139,15 @@ msgstr "管理器 - 仅此版本库" #. Resource IDs: (IDS_SYSTEM_GCMCORE) msgid "manager-core - all Windows users" -msgstr "" +msgstr "manager-core - Windows 所有用户" #. Resource IDs: (IDS_GLOBAL_GCMCORE) msgid "manager-core - current Windows user" -msgstr "" +msgstr "manager-core - Windows 当前用户" #. Resource IDs: (IDS_LOCAL_GCMCORE) msgid "manager-core - this repository only" -msgstr "" +msgstr "manager-core - 仅此版本库" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1494) msgid "master" diff --git a/Languages/Tortoise_zh_TW.po b/Languages/Tortoise_zh_TW.po index 1bada7c71..bc0bdbb2e 100644 --- a/Languages/Tortoise_zh_TW.po +++ b/Languages/Tortoise_zh_TW.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2020 the TortoiseGit team +# Copyright (C) 2008-2021 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -32,7 +32,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: 2020-10-07 09:37+0000\n" +"PO-Revision-Date: 2021-02-26 18:18+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/lznuaa/tortoisegit/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -1862,6 +1862,10 @@ msgstr "允許產生一個只有提交訊息而沒有任何檔案修改的空提 msgid "Already up to date." msgstr "已經是最新的。" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) +msgid "Alternative editor" +msgstr "" + #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" msgstr "永遠推送這本地分支到已選遠端保存" @@ -2129,10 +2133,6 @@ msgstr "作者欄有大小寫之分" msgid "Auto CrLf convert" msgstr "自動轉換 DOS\\UNIX 換行符號" -#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Auto Crlf:" -msgstr "自動轉換換行符號：" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" msgstr "Auto&CrLf:" @@ -2159,6 +2159,10 @@ msgid "" "from the files that you have changed as you type a log message." msgstr "在輸入日誌訊息時，自動從這次有修改的檔案內容中提示單字\n（通常是類別或成員的名稱）。" +#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) +msgid "AutoCrLf:" +msgstr "" + #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" msgstr "自動載入 PuTTY 金鑰(&K)" @@ -2933,6 +2937,18 @@ msgstr "依照時間上色(&C)" msgid "Colors" msgstr "色彩" +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) +msgid "Colors 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) +msgid "Colors 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) +msgid "Colors 3" +msgstr "" + #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format msgid "Column: %d" @@ -3209,6 +3225,14 @@ msgstr "衝突" msgid "Conflicts: %d" msgstr "衝突：%d" +#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) +msgid "Context Menu" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) +msgid "Context Menu 2" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" msgstr "補綴檔上下文行數" @@ -3331,10 +3355,10 @@ msgstr "無法找到上層專案" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) 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 "在 git 版本字串中無法找到「msysgit」或「windows」關鍵字。\n如果你使用的是 cygwin 或 msys2 環境下的 git，你需要啟用專用的 hacks。\n請在說明文件中搜尋關鍵字「cygwin git」或「msys2 git」以取得更多詳細的說明。" +"Could not find \"msysgit\" or \"windows\" in version string 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 "" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) #, c-format @@ -3564,6 +3588,10 @@ msgstr "建立包含你所有修改的統合式差異檔" msgid "Creating pull-request..." msgstr "正在建立拉取要求．．．" +#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) +msgid "Credential" +msgstr "" + #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." msgstr "憑證小幫手不能空白。" @@ -3882,6 +3910,18 @@ msgstr "視窗大小與位置" msgid "Dialogs" msgstr "視窗" +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) +msgid "Dialogs 1" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) +msgid "Dialogs 2" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) +msgid "Dialogs 3" +msgstr "" + #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" msgstr "比較差異" @@ -3898,10 +3938,6 @@ msgstr "比較兩個提交" msgid "Diff Viewer" msgstr "差異檢視器" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) -msgid "Diff Viewer::Merge Tool" -msgstr "差異檢視器::合併工具" - #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "Diff added lines" msgstr "差異－加入行" @@ -4391,7 +4427,7 @@ msgstr "有效的" msgid "Either the name or IP of the proxy server" msgstr "輸入 proxy 伺服器的 IP 或名稱" -#. Resource IDs: (IDS_LOG_EMAIL) +#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321, IDS_LOG_EMAIL) msgid "Email" msgstr "電郵" @@ -5165,16 +5201,16 @@ msgstr "向前 %d" #. Resource IDs: (IDS_ERR_GITUNNEEDEDHACKS) msgid "" -"Found \"msysgit\" or \"windows\" in versionstring of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" -"You can find more information in the help file for the keyword \"cygwin git\" or \"msys2 git\"." -msgstr "在 git 版本字串中找到「msysgit」或「windows」關鍵字，然而，你啟用了 git.exe hacks；這些 hacks 必需被關閉才能正常使用 Git for Windows 相關操作！\n你可以在說明文件中使用關鍵字「cygwin git」或「msys2 git」取得更多相關資訊。" +"Found \"msysgit\" or \"windows\" in version string of git.exe, however, you have git.exe hacks enabled. These hacks must be disabled for proper operation with Git for Windows!\n" +"You can find more information in the help file for the keyword \"Cygwin Git\" or \"MSYS2 Git\"." +msgstr "" #. Resource IDs: (IDS_REBASELOCKFILEFOUND) msgid "" "Found a lock file indicating that a TortoiseGit rebase process is running. This blocks this operation.\n" "\n" -"If you are not runnig a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." -msgstr "找到了一個鎖定檔案，它被用來表示正在執行 TortoiseGit 變基（Rebase）操作，而這個檔會阻擋目前的操作。\n\n如果你並沒有正在執行 TortoiseGit 變基操作，你可以移除這個不適用的鎖定檔案，以便繼續往下操作。" +"If you are not running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." +msgstr "" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) msgid "" @@ -5277,42 +5313,6 @@ msgstr "正在採集統計資料" msgid "General" msgstr "一般" -#. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) -msgid "General::Alternative editor" -msgstr "一般::編輯器" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) -msgid "General::Colors 1" -msgstr "一般::顏色1" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) -msgid "General::Colors 2" -msgstr "一般::顏色2" - -#. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) -msgid "General::Colors 3" -msgstr "一般::顏色3" - -#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) -msgid "General::Context Menu" -msgstr "一般::快顯功能表" - -#. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) -msgid "General::Context Menu 2" -msgstr "一般::快顯功能表 2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) -msgid "General::Dialogs 1" -msgstr "一般::對話視窗1" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) -msgid "General::Dialogs 2" -msgstr "一般::對話視窗2" - -#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) -msgid "General::Dialogs 3" -msgstr "一般::對話視窗3" - #. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS) msgid "Get merge logs" msgstr "取得合併日誌" @@ -5441,14 +5441,6 @@ msgid "" "In order to change settings select a level, enter the values and select where to store to." msgstr "Git 採用階層式組態的概念。\n意即有多層；高層設定會覆蓋低層設定。\n「有效的」分頁顯示目前範圍的有效設定值（唯讀）。\n選擇任一層以檢視其設定值。\n要變更設定值，選擇該層，輸入新的值並選擇儲存到哪一層。" -#. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) -msgid "Git::Credential" -msgstr "Git::憑證" - -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 4570) -msgid "Git::Remote" -msgstr "Git::遠端" - #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1773, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1773, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1773, IDS_CONFIG_GLOBAL, IDS_SETTINGS_GLOBAL) @@ -5626,14 +5618,6 @@ msgstr "提示：在文字輸入區域使用快顯功能表可以取回最近使 msgid "Hook Scripts" msgstr "掛鉤指令檔" -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) -msgid "Hook Scripts::Issue Tracker Config" -msgstr "掛鉤指令檔::Bug 追蹤組態" - -#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) -msgid "Hook Scripts::Issue Tracker Integration" -msgstr "掛鉤指令檔::Bug 追蹤整合" - #. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL) msgid "Hook Type" msgstr "掛鉤類型" @@ -5905,12 +5889,8 @@ msgid "Icon Overlays" msgstr "圖示覆蓋" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) -msgid "Icon Overlays::Icon Set" -msgstr "圖示覆蓋::圖示集" - -#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) -msgid "Icon Overlays::Overlay Handlers" -msgstr "圖示覆蓋::覆蓋處理程式" +msgid "Icon Set" +msgstr "" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -6140,8 +6120,8 @@ msgid "Importing file %s" msgstr "正在匯入檔案 %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) -msgid "In ChangeList" -msgstr "在變更列表" +msgid "In Changelist" +msgstr "" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) msgid "In Commits" @@ -6213,7 +6193,7 @@ msgstr "插入剪貼簿內容\n貼上" #. Resource IDs: (IDS_CLONE_BRANCH_TT) msgid "" "Instead of pointing the newly created HEAD to the branch pointed to by the " -"cloned repository’s HEAD, point to specific branch instead." +"cloned repository's HEAD, point to specific branch instead." msgstr "" #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) @@ -6238,6 +6218,14 @@ msgstr "不正確的貨幣." msgid "Invalid revision number!" msgstr "無效的版本編號！" +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) +msgid "Issue Tracker Config" +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) +msgid "Issue Tracker Integration" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" msgstr "發送者：" @@ -6718,6 +6706,10 @@ msgstr "合併點" msgid "Merge Reintegrate" msgstr "合併-重新整合" +#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) +msgid "Merge Tool" +msgstr "" + #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" "Merge between original branch, working tree contents, and the branch to " @@ -6889,10 +6881,6 @@ msgstr "多層次" msgid "Network" msgstr "網路" -#. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 321) -msgid "Network::Email" -msgstr "網路::郵件" - #. Resource IDs: (Dialog AFX_IDD_NEWTYPEDLG: Control id 30721, IDS_NEW) msgid "New" msgstr "新增" @@ -7169,7 +7157,7 @@ msgstr "請注意：如果您選擇還原自動儲存的文件，您必須要手 #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535) msgid "" "Note: These settings also apply to the Patch Viewer dialog.\n" -"To select whether you would like to use the build-in or any alterative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." +"To select whether you would like to use the build-in or any alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." msgstr "" #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) @@ -7486,8 +7474,8 @@ msgid "Others" msgstr "其它" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) -msgid "Out ChangeList" -msgstr "輸出的變更列表" +msgid "Out Changelist" +msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) msgid "Out Commits" @@ -7505,6 +7493,10 @@ msgstr "輸出目錄" msgid "Output.prn" msgstr "Output.prn" +#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) +msgid "Overlay Handlers" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" msgstr "覆寫" @@ -7929,14 +7921,11 @@ msgid "Proxy Settings" msgstr "Proxy 設定" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1603, Dialog -#. IDD_SETTINREMOTE: Control id 1603) +#. IDD_SETTINGIT_CONFIG: Control id 1603, Dialog IDD_SETTINREMOTE: Control id +#. 1603) msgid "Prune" msgstr "剪除" -#. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1785) -msgid "Prune (All remotes)" -msgstr "剪除 (所有遠端)" - #. Resource IDs: (Dialog IDD_SYNC: Control id 1611, IDS_PROGRS_TITLE_PULL) msgid "Pull" msgstr "拉取" @@ -8178,14 +8167,18 @@ msgid "Ref List" msgstr "參照列表" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog -#. IDD_REVGRAPHFILTER: Control id 1729, IDS_REFBROWSE) -msgid "RefBrowse" -msgstr "參照瀏覽" +#. IDD_REVGRAPHFILTER: Control id 1729) +msgid "RefBrowser" +msgstr "" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" msgstr "參照日誌" +#. Resource IDs: (IDS_REFBROWSE) +msgid "Reference Browser" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" msgstr "提交位於哪些參照上" @@ -8262,7 +8255,8 @@ msgstr "記憶此次的選擇（「svn.rmdir」選項）" msgid "Reminder: Commit your change after resolve" msgstr "提醒：在解決衝突後提交變更" -#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573) +#. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog +#. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" msgstr "遠端" @@ -8785,8 +8779,8 @@ msgid "Sa&feCrLf:" msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) -msgid "Safe Crlf:" -msgstr "檢查换行符號：" +msgid "SafeCrLf:" +msgstr "" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9248,8 +9242,8 @@ msgid "Show" msgstr "顯示" #. Resource IDs: (IDS_MENUREFLOG) -msgid "Show &Reflog" -msgstr "顯示參照日誌(&R)" +msgid "Show &RefLog" +msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, #. IDS_PROC_LOG_SHOWUNVERSIONED) @@ -9421,8 +9415,8 @@ msgid "Show la&beled commits only" msgstr "僅僅顯示有標記的提交(&B)" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) -msgid "Show linenumber&s" -msgstr "顯示行號(&S)" +msgid "Show line number&s" +msgstr "" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -10242,6 +10236,10 @@ msgstr "檔案太大" msgid "The file is too large to open." msgstr "檔案過大, 無法開啟." +#. Resource IDs: (IDS_MODIFIEDASKSAVE) +msgid "The file was modified. Do you want to save the changes?" +msgstr "" + #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format msgid "" @@ -10745,12 +10743,12 @@ msgstr "TortoiseGitBlame, 版本 %d.%d.%d.%d" msgid "" "TortoiseGitBlame\n" "\n" -"TortoiseGitBlam\n" +"TortoiseGitBlame\n" "\n" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" +msgstr "" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10871,8 +10869,8 @@ msgid "Trim right" msgstr "切齊右側" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) -msgid "Trust the exitcode of the external mege tool for auto resolving" -msgstr "自動解決衝突時信任外部合併工具的退出碼" +msgid "Trust the exitcode of the external merge tool for auto resolving" +msgstr "" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." @@ -11120,8 +11118,8 @@ msgid "Use .mailmap" msgstr "使用 .mailmap" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" -msgstr "使用 Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" +msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) msgid "Use HTTP path component" @@ -11705,6 +11703,11 @@ msgstr "你已經安裝了最新版。" msgid "You asked to pull, but did not specify a remote branch." msgstr "你要求拉取，卻沒有指定遠端分支。" +#. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) +msgid "" +"You can configure it for all remotes or global on the Git settings page." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" "You can disable specific Overlay handlers here.\n" -- 2.11.4.GIT