From 17ee633d1485018db87007b91d51144ad1d3b1f0 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Mon, 31 Jan 2022 18:40:40 +0100 Subject: [PATCH] Sync translations with Transifex Signed-off-by: Sven Strickroth --- Languages/Tortoise_bg.po | 203 +++++++++---- Languages/Tortoise_ca.po | 361 ++++++++++++++--------- Languages/Tortoise_cs.po | 205 +++++++++---- Languages/Tortoise_da.po | 203 +++++++++---- Languages/Tortoise_de.po | 209 ++++++++++---- Languages/Tortoise_el.po | 206 +++++++++---- Languages/Tortoise_es.po | 260 +++++++++++------ Languages/Tortoise_fa.po | 203 +++++++++---- Languages/Tortoise_fi.po | 203 +++++++++---- Languages/Tortoise_fr.po | 237 ++++++++++----- Languages/Tortoise_he.po | 223 +++++++++----- Languages/Tortoise_hu.po | 203 +++++++++---- Languages/Tortoise_id.po | 203 +++++++++---- Languages/Tortoise_it.po | 271 +++++++++++------ Languages/Tortoise_ja.po | 211 ++++++++++---- Languages/Tortoise_ko.po | 207 +++++++++---- Languages/Tortoise_lt.po | 201 +++++++++---- Languages/Tortoise_nl.po | 203 +++++++++---- Languages/Tortoise_oc.po | 203 +++++++++---- Languages/Tortoise_pl.po | 251 +++++++++++----- Languages/Tortoise_pt_BR.po | 263 +++++++++++------ Languages/Tortoise_pt_PT.po | 203 +++++++++---- Languages/Tortoise_ro.po | 203 +++++++++---- Languages/Tortoise_ru.po | 231 ++++++++++----- Languages/Tortoise_sk.po | 203 +++++++++---- Languages/Tortoise_sl.po | 203 +++++++++---- Languages/Tortoise_sq.po | 201 +++++++++---- Languages/Tortoise_sr@Cyrl.po | 203 +++++++++---- Languages/Tortoise_sr@latin.po | 203 +++++++++---- Languages/Tortoise_sv.po | 255 ++++++++++------ Languages/Tortoise_tr.po | 247 +++++++++++----- Languages/Tortoise_uk.po | 203 +++++++++---- Languages/Tortoise_vi.po | 638 +++++++++++++++++++++++------------------ Languages/Tortoise_zh_CN.po | 207 +++++++++---- Languages/Tortoise_zh_TW.po | 255 ++++++++++------ 35 files changed, 5688 insertions(+), 2496 deletions(-) diff --git a/Languages/Tortoise_bg.po b/Languages/Tortoise_bg.po index 94c7b6d0e..4bea61711 100644 --- a/Languages/Tortoise_bg.po +++ b/Languages/Tortoise_bg.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Bulgarian (http://www.transifex.com/lznuaa/tortoisegit/language/bg/)\n" "MIME-Version: 1.0\n" @@ -710,9 +710,10 @@ msgstr "&Шрифт за дневника:" msgid "&Font:" msgstr "&Шрифт:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "" @@ -1226,6 +1227,10 @@ msgstr "&Смачкване" msgid "&Squash ALL" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Стартирай" @@ -1330,6 +1335,10 @@ msgstr "&Непознати устройства" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "&На горе" @@ -1385,14 +1394,14 @@ msgstr "&Да" msgid "&add \"cherry picked from\"" msgstr "" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "&познати промени" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "" @@ -2905,6 +2914,10 @@ msgstr "Затваря активния прозорец и напомня да msgid "Collapse" msgstr "Свиване" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4648,6 +4661,10 @@ msgstr "" msgid "Exit" msgstr "Изход" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Отваряне в Windows Explorer на" @@ -5165,10 +5182,6 @@ msgstr "" msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5251,6 +5264,10 @@ msgstr "" msgid "Full data" msgstr "" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "" @@ -5561,6 +5578,14 @@ msgstr "Скрий менютата за неревизирани папки" msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Скриване на скрипта, докато се изпълнява" @@ -6202,6 +6227,13 @@ msgstr "Невалидна валута." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6255,7 +6287,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "Запис на списъците с промени" @@ -6277,7 +6309,7 @@ msgstr "Корейски" msgid "L" msgstr "" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7564,6 +7596,16 @@ msgstr "" msgid "Parent(s)" msgstr "" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "" @@ -8522,7 +8564,8 @@ msgstr "Възтановяване" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Възстановяване на настройките по подразбиране" @@ -8676,11 +8719,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9076,8 +9114,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Изберете поведението на диалоговия прозорец, показващ хода на операцията, след нейния край." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9113,7 +9151,8 @@ msgstr "" #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "" @@ -9446,6 +9485,11 @@ msgstr "Показва дневник..." msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9677,6 +9721,20 @@ msgstr "Диаграма с насложени ленти" msgid "Stacked Line Graph" msgstr "Диаграма с насложени линии" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Стандартен" @@ -10637,6 +10695,14 @@ msgstr "До:" msgid "Toggle filters" msgstr "" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10756,8 +10822,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseGitIDiff: програма за сравняване на изображения за TortoiseSVN\n\nНаличните параметри на командния ред са:\n/left:'път до лявото изображение'\n/lefttitle:'заглавие за лявото изображение'\n/right:'път до дясното изображение'\n/righttitle:'заглавие за дясното изображение'\n/overlay\t\tза включване не режим с припокриване\n/fit\t\tза напасване на размера на изображенията\n/showinfo\t\tза показване на полетата с информация за изображенията" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10954,6 +11020,11 @@ msgstr "Грешка при запис в %1 - или е само за чете msgid "Uncheck" msgstr "Премахване на отметка" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11027,6 +11098,16 @@ msgstr "Неразрешени конфликти!" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Неозаглавен" @@ -11081,30 +11162,10 @@ msgstr "Изглед с &единично пано по подразбиране msgid "Use &other text block" msgstr "Използване на &другия текстов блок" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11190,11 +11251,13 @@ msgstr "" msgid "Use left file" msgstr "Използване на левият файл" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11214,11 +11277,12 @@ msgstr "С регулярни изрази" msgid "Use right block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11439,10 +11503,19 @@ msgstr "" msgid "View Bars" msgstr "" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "Виж пътя" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11488,7 +11561,7 @@ msgid "Waiting for input" msgstr "" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11575,6 +11648,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11601,6 +11688,10 @@ msgstr "" msgid "Whitespaces" msgstr "Празни символи" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12030,6 +12121,10 @@ msgstr "" msgid "file/foldernames" msgstr "" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "" @@ -12267,10 +12362,6 @@ msgstr "към %1" msgid "to %s" msgstr "към %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "седмица" diff --git a/Languages/Tortoise_ca.po b/Languages/Tortoise_ca.po index ac60e1fca..9c9f170c4 100644 --- a/Languages/Tortoise_ca.po +++ b/Languages/Tortoise_ca.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -13,15 +13,15 @@ # el_libre como el chaval , 2011 # Lübbe Onken , 2013 # Lübbe Onken , 2013 -# Sven Strickroth , 2013,2015,2020 +# Sven Strickroth , 2013,2015,2020-2021 # TempEmail.net , 2013 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: 2021-03-28 10:13+0000\n" -"Last-Translator: Joan Monguillot \n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" +"Last-Translator: Sven Strickroth \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" @@ -714,9 +714,10 @@ msgstr "&Font pels missatges de registre:" msgid "&Font:" msgstr "&Font:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "Força" @@ -726,7 +727,7 @@ msgstr "Força Rebase" #. Resource IDs: (IDS_CREATE_PATCH) msgid "&Format Patch..." -msgstr "" +msgstr "&Formata pedaç..." #. Resource IDs: (Dialog IDD_CLONE: Control id 1608) msgid "&From:" @@ -1230,6 +1231,10 @@ msgstr "&Esclafa" msgid "&Squash ALL" msgstr "&Esclafa tots" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Inicia" @@ -1252,7 +1257,7 @@ msgstr "Canvia a la branca nova" #. Resource IDs: (IDS_SWITCH_BRANCH) msgid "&Switch/Checkout to" -msgstr "" +msgstr "&Canvia a/Extreu a" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 1173) msgid "&Symbol View" @@ -1334,6 +1339,10 @@ msgstr "&Unitats desconegudes" msgid "&Unlock" msgstr "Desbloqueja" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "Amunt" @@ -1362,7 +1371,7 @@ msgstr "&Vista" #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1851) msgid "&View effective config" -msgstr "" +msgstr "&Visualitza la configuració efectiva" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 65535) msgid "&Warn on missing Signed-Off-By on commit" @@ -1389,14 +1398,14 @@ msgstr "&Sí" msgid "&add \"cherry picked from\"" msgstr "&afegeix \"escollit des de\"" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "Ignora canvis d'espais en blanc" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "&canvis coneguts" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(TortoiseGit per defecte)" @@ -1816,7 +1825,7 @@ msgstr "Totes les branques locals" msgid "" "All or some options are limited. In order to change all these settings, you " "need Administrator rights." -msgstr "" +msgstr "Algunes o totes les opcions tenen limitacions. Per canviar aquests paràmetres us calen drets d'administrador." #. Resource IDs: (IDS_ALLREFS) msgid "All refs" @@ -1852,7 +1861,7 @@ msgstr "Ja està al dia" #. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) msgid "Alternative editor" -msgstr "" +msgstr "Editor alternatiu" #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" @@ -2874,7 +2883,7 @@ msgstr "Clona en un nou dipòsit cru" #. Resource IDs: (IDS_CLONE_BARE_REPO_TT) msgid "Clone into a git repository without the working tree." -msgstr "" +msgstr "Clona cap a un dipòsit git sense el directori de treball." #. Resource IDs: (IDS_MENUCLONE) msgid "Clone..." @@ -2909,6 +2918,10 @@ msgstr "Tanca la finestra activa i pregunta si es volen gravar els documents" msgid "Collapse" msgstr "Contrau" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -2944,7 +2957,7 @@ msgstr "Columna: %d" #. Resource IDs: (IDS_COMBINE_TO_ONE) msgid "Com&bine to one commit" -msgstr "" +msgstr "Com&bina en una sola entrega" #. Resource IDs: (Dialog IDD_SENDMAIL: Control id 1481) msgid "Combine One Mail" @@ -3066,7 +3079,7 @@ msgstr "Nom habitual:" #. Resource IDs: (IDS_LOG_POPUP_COMPARECHANGESET) msgid "Comp&are change sets" -msgstr "" +msgstr "Comp&ara conjunts de canvis" #. Resource IDs: (IDS_REVGRAPH_POPUP_COMPAREHEADS, #. ID_VIEW_COMPAREHEADREVISIONS - Menu) @@ -3075,7 +3088,7 @@ msgstr "Compara revisions &HEAD" #. Resource IDs: (IDS_LOG_POPUP_COMPARE_PARENT_WC) msgid "Compare parent with working tree" -msgstr "" +msgstr "Compara el pare amb el directori de treball" #. Resource IDs: (IDS_PROC_BROWSEREFS_COMPAREREFS) msgid "Compare selected refs" @@ -3346,7 +3359,7 @@ msgid "" "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 "" +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\"." #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) #, c-format @@ -3485,7 +3498,7 @@ msgstr "Crea una &nova branca..." #. Resource IDs: (IDS_CREATE_TAG_AT_THIS) msgid "Create &Tag at this version..." -msgstr "" +msgstr "Crea e&tiqueta en aquesta revisió..." #. Resource IDs: (IDS_MENUTAG) msgid "Create &Tag..." @@ -3501,7 +3514,7 @@ msgstr "Crea arxiu .gitignore" #. Resource IDs: (IDS_CREATE_BRANCH_AT_THIS) msgid "Create Br&anch at this version..." -msgstr "" +msgstr "Crea una br&anca en aquesta revisió..." #. Resource IDs: (IDS_PROGS_TITLE_CREATEBRANCH) msgid "Create Branch" @@ -4317,7 +4330,7 @@ msgstr "S&urt" #. Resource IDs: (IDS_EXPORT_TO_THIS) msgid "E&xport this version..." -msgstr "" +msgstr "E&xporta aquesta versió..." #. Resource IDs: (IDS_MENUEXPORT) msgid "E&xport..." @@ -4346,7 +4359,7 @@ msgstr "Edita" #. Resource IDs: (IDS_EDIT_NOTES) msgid "Edit &Notes" -msgstr "" +msgstr "Edita ¬es" #. Resource IDs: (IDS_PROC_EDITGLOBALGITCONFIG) msgid "Edit &global .gitconfig" @@ -4652,6 +4665,10 @@ msgstr "Executable (+x)" msgid "Exit" msgstr "Surt" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Explora a" @@ -4793,7 +4810,7 @@ msgstr "No ha pogut gravar document." msgid "" "Failed to save file \"%s\":\n" "%s" -msgstr "" +msgstr "No s'ha pogut desar el fitxer \"%s\":\n%s" #. Resource IDs: (IDS_SVNACTION_CHANGELISTFAILED) #, c-format @@ -4991,7 +5008,7 @@ msgstr "Filtra per" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 65535) msgid "Filter match" -msgstr "" +msgstr "Filtra coincidència" #. Resource IDs: (IDS_FILEDIFF_FILTERCUE) msgid "Filter paths" @@ -5169,10 +5186,6 @@ msgstr "Força el rebase fins i tot si la branca actual és descendent de l'entr msgid "Force unlock" msgstr "Forçar desbloqueig" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "Forçar: Potser rebutja" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5191,14 +5204,14 @@ msgstr "Avança %d" msgid "" "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 "" +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\"." #. 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 running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." -msgstr "" +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." #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) msgid "" @@ -5255,6 +5268,10 @@ msgstr "Entrega completa de dades sense camins modificats" msgid "Full data" msgstr "Dades completes" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "Cerca text complet" @@ -5459,7 +5476,7 @@ msgstr "Vés a la propera diferència\nPropera diferència" msgid "" "Go to the next inline difference\n" "Next inline difference" -msgstr "Vés a la propera diferència en-línia\nPropera diferència en-línia" +msgstr "Vés a la propera diferència en línia\nPropera diferència en línia" #. Resource IDs: (cmdNavigatePreviousConflict) msgid "" @@ -5477,7 +5494,7 @@ msgstr "Vés a la diferència prèvia\nDiferència prèvia" msgid "" "Go to the previous inline difference\n" "Previous inline difference" -msgstr "Vés a l'anterior diferència en-línia\nAnterior diferència en-línia" +msgstr "Vés a l'anterior diferència en línia\nAnterior diferència en línia" #. Resource IDs: (ID_EDIT_GOTOLINE - Menu, cmdGotoLine_LabelTitle_RESID) msgid "Goto Line" @@ -5565,6 +5582,14 @@ msgstr "Oculta menús per rutes no versionades" msgid "Hide Patch<<" msgstr "Amaga pedaç<<" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Amaga l'script mentre s'està executant" @@ -5878,7 +5903,7 @@ msgstr "Sobreposició d'icones" #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184) msgid "Icon Set" -msgstr "" +msgstr "Conjunt d'icones" #. Resource IDs: (IDS_ICONFILEFILTER) msgid "" @@ -5952,7 +5977,7 @@ msgid "" "the content possibly have been altered by third parties unnoticed (e.g. " "after pull or merge). Keep this in mind especially if you approve a " "repository hook permanently." -msgstr "" +msgstr "Si esteu executant un fitxer versionat del dipòsit, considereu la possibilitat de que el contingut s'hagi alterat per altres parts (p. e. després d'estirar o fusionar). Tingueu-ho present especialment si aproveu un hook pel dipòsit de forma permanent." #. Resource IDs: (Dialog IDD_CREATEREPO: Control id 1654) msgid "" @@ -6109,7 +6134,7 @@ msgstr "Important arxiu %s" #. Resource IDs: (IDS_PROC_SYNC_INCHANGELIST) msgid "In Changelist" -msgstr "" +msgstr "A la llista de canvis" #. Resource IDs: (IDS_PROC_SYNC_INCOMMITS) msgid "In Commits" @@ -6152,21 +6177,21 @@ msgstr "Importació Inicial" #. Resource IDs: (IDS_PROC_REPOCREATED) #, c-format msgid "Initialized empty Git repository in %s." -msgstr "Inicialitza un nou dipòsit git a la carpeta %s" +msgstr "Inicialitzar un dipòsit git buit a %s." #. Resource IDs: (ID_VIEW_INLINEDIFF - Menu, #. cmdViewInlineDiff_LabelTitle_RESID) msgid "Inline diff" -msgstr "Diff en-linia" +msgstr "Diff en línia" #. Resource IDs: (ID_VIEW_INLINEDIFFWORD - Menu, #. cmdViewInlineDiffWord_LabelTitle_RESID) msgid "Inline diff word-wise" -msgstr "Diff en-linia per paraules" +msgstr "Diff en línia per paraules" #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535) msgid "Inline differences" -msgstr "Diferències en-línia" +msgstr "Diferències en línia" #. Resource IDs: (Dialog IDD_INPUTDLG: Control id 161) msgid "Input" @@ -6182,13 +6207,13 @@ msgstr "Insereix contingut del Porta-retalls\nEnganxa" 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 "" +msgstr "En lloc de que el nou HEAD apunti a la branca apuntada pel HEAD clonat, apunta a una branca específica." #. Resource IDs: (IDS_CLONE_ORIGIN_NAME_TT) msgid "" "Instead of using the remote name \"origin\" to keep track of the upstream " "repository, use the specific name." -msgstr "" +msgstr "En lloc d'usar el nom remot \"origen\" per seguir el dipòsit upstream, usar el nom específic." #. Resource IDs: (AFX_IDP_FAILED_MEMORY_ALLOC) msgid "Insufficient memory to perform operation." @@ -6206,13 +6231,20 @@ msgstr "Valor Monetari Incorrecte." msgid "Invalid revision number!" msgstr "El número de revisió no és vàlid!" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" -msgstr "" +msgstr "Configuració del rastreig d'incidències" #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) msgid "Issue Tracker Integration" -msgstr "" +msgstr "Integració del Seguidor d'Incidències" #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" @@ -6259,7 +6291,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "Manté" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "Manté la Changelist" @@ -6281,7 +6313,7 @@ msgstr "Korean" msgid "L" msgstr "L" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "LFS" @@ -6339,7 +6371,7 @@ msgstr "Idioma:" #. Resource IDs: (IDS_MENUDESCLFS) msgid "Large file storage" -msgstr "" +msgstr "Magatzem de grans fitxers (LFS)" #. Resource IDs: (IDS_LAST_N_COMMITS) #, c-format @@ -6645,7 +6677,7 @@ msgstr "Blocs marcats" #. Resource IDs: (IDS_INDICATOR_MARKEDWORDCOUNT) #, c-format msgid "Marked words: %s" -msgstr "" +msgstr "Paraules marcades: %s" #. Resource IDs: (cmdMarkResolved) msgid "" @@ -6696,7 +6728,7 @@ msgstr "Fusiona Reintegra" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) msgid "Merge Tool" -msgstr "" +msgstr "Eina de fusió" #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" @@ -6963,7 +6995,7 @@ msgstr "Sense prefixos /a i /b" msgid "" "No checkout of HEAD is performed after the clone is complete.\n" "This makes the working tree empty." -msgstr "" +msgstr "No es fa cap extracció del HEAD després de completar la clonació.\nAixò fa que l'arbre de treball estigui buit." #. Resource IDs: (IDS_ERR_NOCOMMAND) msgid "" @@ -7077,7 +7109,7 @@ msgstr "No hi ha cache d'estat. Només les carpetes versionades mostren una icon #. Resource IDs: (IDS_NOGITREPO) msgid "No valid git repository found." -msgstr "" +msgstr "No s'ha trobat un dipòsit git vàlid." #. Resource IDs: (IDS_NOWORKINGCOPY) msgid "No working directory found." @@ -7146,7 +7178,7 @@ msgstr "Avis: Si escull recuperar els documents auto-desats, heu de desar-los ex 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 alternative diff viewer program go to \"Diff Viewer\" preferences section in the leftward tree." -msgstr "" +msgstr "Nota: Aquests paràmetres també apliquen al diàleg del visualitzador de pedaços.\nPer triar si voleu el visualitzador intern o qualsevol altre programa alternatiu aneu a la secció de preferències \"Visor de Diffs\" de l'arbre esquerre." #. Resource IDs: (Dialog IDD_REVERT: Control id 1481) msgid "Note: the folder contains unversioned items" @@ -7377,7 +7409,7 @@ msgstr "Obre" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1849) msgid "Open &settings" -msgstr "" +msgstr "Obre la configuració" #. Resource IDs: (57601) msgid "" @@ -7463,7 +7495,7 @@ msgstr "Altres" #. Resource IDs: (IDS_PROC_SYNC_OUTCHANGELIST) msgid "Out Changelist" -msgstr "" +msgstr "Fora de la llista de canvis" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) msgid "Out Commits" @@ -7483,7 +7515,7 @@ msgstr "Sortida.prn" #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) msgid "Overlay Handlers" -msgstr "" +msgstr "Conjunt d'icones" #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" @@ -7568,6 +7600,16 @@ msgstr "Pare de %2!s!" msgid "Parent(s)" msgstr "Pare(s)" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Contrasenya:" @@ -7714,7 +7756,7 @@ msgstr "Introduïu un camí on aplicar l'script hook. Useu \"*\" per a tots els #. Resource IDs: (IDS_GITCHANGED_NEEDRESTART) msgid "Please restart TortoiseGit for the changes of git.exe to take effect." -msgstr "" +msgstr "Heu de reiniciar el TortoiseGit per fer efectius els canvis de git.exe." #. Resource IDs: (IDS_FIRSTSTART_HINT3) msgid "" @@ -7825,7 +7867,7 @@ msgstr "Diferència anterior" #. Resource IDs: (ID_NAVIGATE_PREVINLINEDIFF - Menu, #. cmdNavigatePreviousInlineDiff_LabelTitle_RESID) msgid "Previous inline difference" -msgstr "Diferència en-línia anterior" +msgstr "Diferència en línia anterior" #. Resource IDs: (57608) msgid "" @@ -7926,7 +7968,7 @@ msgstr "Estira (recupera i fusiona) entregues des d'una branca remota." msgid "" "Pull requires the selected local branch to be the current branch.\n" "Do you want to switch to the selected branch?" -msgstr "" +msgstr "Estira necessita que la branca seleccionada sigui la branca actual.\nVoleu canviar a la branca seleccionada?" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 302) msgid "Pull/Fetch" @@ -7955,7 +7997,7 @@ msgstr "Empeny" #. Resource IDs: (Dialog IDD_PUSH: Control id 1492) msgid "Push &option:" -msgstr "" +msgstr "&Opció Empeny:" #. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1786) msgid "Push Default" @@ -8012,7 +8054,7 @@ msgstr "Unitats R&AM" #. Resource IDs: (IDS_RESET_TO_THIS_FORMAT) #, c-format msgid "R&eset \"%s\" to this..." -msgstr "" +msgstr "R&einicialitza \"%s\" a això..." #. Resource IDs: (IDS_RESTORE_FROM_INDEX) msgid "R&estore this file from index" @@ -8083,7 +8125,7 @@ msgstr "Rebase" #. Resource IDs: (IDS_REBASE_THIS_FORMAT) #, c-format msgid "Rebase \"%s\" onto this...(&G)" -msgstr "" +msgstr "Fes un rebase de \"%s\" a això...(&G)" #. Resource IDs: (IDS_MENUREBASE) msgid "Rebase..." @@ -8114,7 +8156,7 @@ msgstr "Només Registre" msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" -msgstr "Recupera els documents auto-desats.\nObre les versions auto-desades enlloc de les versions desades explícitament" +msgstr "Recupera els documents auto-desats\nObre les versions auto-desades en lloc de les versions desades explícitament" #. Resource IDs: (IDS_REBASE_ABORT_TT) msgid "Recover to the status before rebase" @@ -8157,7 +8199,7 @@ msgstr "Llista de ref" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog #. IDD_REVGRAPHFILTER: Control id 1729) msgid "RefBrowser" -msgstr "" +msgstr "RefBrowser" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" @@ -8165,7 +8207,7 @@ msgstr "RefLog" #. Resource IDs: (IDS_REFBROWSE) msgid "Reference Browser" -msgstr "" +msgstr "Explorador de referències" #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" @@ -8526,7 +8568,8 @@ msgstr "Restaura" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Restaura Per Defecte" @@ -8680,11 +8723,6 @@ msgstr "Executa quan el directori de treball està sota:" msgid "S" msgstr "S" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "&Mostra els arxius modificats en el directori de treball" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "&Omet el no seleccionat" @@ -8768,7 +8806,7 @@ msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) msgid "SafeCrLf:" -msgstr "" +msgstr "SafeCrLf:" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9076,12 +9114,12 @@ msgstr "Selecciona destinació de la fusió" #. Resource IDs: (Dialog IDD_SELECTREMOTEREF: Control id 4601) msgid "Select remote ref - TortoiseGit" -msgstr "" +msgstr "Selecciona referència remota - TortoiseGit" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Selecciona comportament del diàleg de progrés al final de la operació." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9117,7 +9155,8 @@ msgstr "Seleccioni l'arxiu que voleu anomenar i desar\nNota: Hi ha un conflicte #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "Selecciona/Desselecciona tots" @@ -9231,7 +9270,7 @@ msgstr "Mostra" #. Resource IDs: (IDS_MENUREFLOG) msgid "Show &RefLog" -msgstr "" +msgstr "Mostra &RefLog" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, #. IDS_PROC_LOG_SHOWUNVERSIONED) @@ -9277,7 +9316,7 @@ msgstr "Mostra nodes revisió HEAD" msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" -msgstr "Mostra Diff en-línia paraula per paraula\nDiff en-línia per paraula" +msgstr "Mostra Diff en línia paraula per paraula\nDiff en línia per paraula" #. Resource IDs: (cmdViewInlineDiff) msgid "" @@ -9296,11 +9335,11 @@ msgstr "Mostra espais en blanc" #. Resource IDs: (Dialog IDD_CHANGEDFILES: Control id 1210) msgid "Show all &staged files" -msgstr "" +msgstr "Mostra tots els fitxers marcats" #. Resource IDs: (ID_VIEW_SHOWALLTAGS - Menu) msgid "Show all tags" -msgstr "" +msgstr "Mostra totes les etiquetes" #. Resource IDs: (32813) msgid "Show an overview of the whole graph" @@ -9327,11 +9366,11 @@ msgstr "Mostra el número de revisió de la branca (git rev-list --count --first #. Resource IDs: (IDS_LOG_POPUP_SHOWBRANCHES) msgid "Show branches this commit is &on" -msgstr "" +msgstr "Mostra les branques que tenen aquesta entrega" #. Resource IDs: (ID_VIEW_SHOWBRANCHINGSANDMERGES - Menu) msgid "Show branchings and &merges" -msgstr "" +msgstr "Mostra brancatges i fusions" #. Resource IDs: (IDS_LOG_POPUP_GNUDIFF) msgid "Show changes as &unified diff" @@ -9404,7 +9443,7 @@ msgstr "Mostra només les entregues etiquetades" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1063) msgid "Show line number&s" -msgstr "" +msgstr "Mostra número&s de línia" #. Resource IDs: (IDS_MENULFSLOCKS) msgid "Show locked files" @@ -9427,7 +9466,7 @@ msgstr "Mostra el registre abans de canviar el nom/copiar" #. Resource IDs: (ID_VIEW_SHOWLOGID - Menu) msgid "Show log ID instead of SHA-1" -msgstr "" +msgstr "Mostra l'ID del registre en lloc de SHA-1" #. Resource IDs: (IDS_SHOWLOG_OF) #, c-format @@ -9450,6 +9489,11 @@ msgstr "Mostra el registre..." msgid "Show long format even if a tag is exactly on that commit" msgstr "Mostra el format llarg encara que una etiqueta estigui exactament en aquesta entrega" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9681,6 +9725,20 @@ msgstr "Gràfic de barres apilades" msgid "Stacked Line Graph" msgstr "Gràfic de línies apilades" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Estàndard" @@ -9913,7 +9971,7 @@ msgstr "Sub-mòduls" #. Resource IDs: (IDS_CLONE_RECURSIVE_TT) msgid "Submodules are initialized and cloned using their default settings." -msgstr "" +msgstr "Els submòduls s'inicialitzen i es clonen amb els paràmetres per defecte." #. Resource IDs: (IDS_SUCCESS) msgid "Success" @@ -9921,7 +9979,7 @@ msgstr "Èxit" #. Resource IDs: (IDS_SWITCH_TO_THIS) msgid "Sw&itch/Checkout to this..." -msgstr "" +msgstr "Canv&ia/Extreu a aquest..." #. Resource IDs: (IDS_PROGRS_TITLE_SWITCH) msgid "Switch" @@ -9962,7 +10020,7 @@ msgstr "Intercanvia els continguts de les visualitzacions esquerra i dreta\nInte #. Resource IDs: (IDS_PROC_SYNC_SWITCHTO) #, c-format msgid "Switch to \"%s\"" -msgstr "" +msgstr "Canvia a \"%s\"" #. Resource IDs: (AFX_IDS_SCNEXTWINDOW) msgid "Switch to the next document window" @@ -10155,7 +10213,7 @@ msgstr "S'ha canviat l'auxiliar de credencials.\nVoleu desar els canvis o descar msgid "" "The current commit will be empty (e.g., due to conflict resolution). Skip " "the commit or keep the message only commit?" -msgstr "" +msgstr "L'entrega actual quedarà buida (degut per exemple a resolució de conflictes). Ometre l'entrega o mantenir el missatge de només entrega?" #. Resource IDs: (IDS_ERROR_NOCLEAN_STASH) msgid "" @@ -10226,7 +10284,7 @@ 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 "" +msgstr "S'ha modificat el fitxer. Voleu desar els canvis?" #. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM) #, c-format @@ -10641,6 +10699,14 @@ msgstr "A:" msgid "Toggle filters" msgstr "Alterna els filtres" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10736,7 +10802,7 @@ msgid "" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "" +msgstr "TortoiseGitBlame\n\nTortoiseGitBlame\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10760,8 +10826,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseGitIDiff: el visualitzador de diffs d'imatges de TortoiseGit\n\nLes comandes disponibles son:\n/left:\"ruta a la imatge de l'esquerra\"\n/lefttitle:\"títol per a la imatge de l'esquerra\"\n/right:\"ruta a la imatge de la dreta\"\n/righttitle:\"títol per a la imatge de la dreta\"\n/overlay\t\tactiva les sobre-posicions\n/fit\t\tajusta les mides de les imatges\n/showinfo\t\tmostra informació sobre les imatges" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10858,7 +10924,7 @@ msgstr "Retalla espais de la dreta" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) msgid "Trust the exitcode of the external merge tool for auto resolving" -msgstr "" +msgstr "Confiar en el codi de sortida de l'eina de fusió externa per a la resolució automàtica" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." @@ -10914,7 +10980,7 @@ msgstr "UTF-8" #. Resource IDs: (IDS_ERR_CHANGELIST_LOAD) msgid "Unable to load changelists" -msgstr "" +msgstr "No es pot carregar la llista de canvis" #. Resource IDs: (AFX_IDP_FAILED_MAPI_LOAD) msgid "Unable to load mail system support." @@ -10943,7 +11009,7 @@ msgstr "No s'ha pogut reconstruir la ruta de l'arbre de treball!\nAixò pot pass #. Resource IDs: (IDS_ERR_CHANGELIST_SAVE) msgid "Unable to save changelists" -msgstr "" +msgstr "No es pot desar la llista de canvis" #. Resource IDs: (AFX_IDP_SET_NOT_SUPPORTED) msgid "Unable to write read-only property." @@ -10958,6 +11024,11 @@ msgstr "No es possible escriure a %1, es de només lectura o és oberta per alg msgid "Uncheck" msgstr "Desactiva" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11031,6 +11102,16 @@ msgstr "Conflictes sense resoldre!" msgid "Unset tracked branch" msgstr "Desactiva la branca rastrejada" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Sense títol" @@ -11085,30 +11166,10 @@ msgstr "Utilitza per defecte la visualització &un-panell per trobar diferènci msgid "Use &other text block" msgstr "Utilitza un altre &bloc de text" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Utilitza el bloc de text \"meu\"" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Utilitza el bloc de text \"meu\", i després el \"d'ells\"" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Utilitza el bloc de text \"d'ells\"" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Utilitza el bloc de text \"d'ells\", i després el \"meu\"" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "Utilitza .mailmap" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "Utilitza component de ruta HTTP" @@ -11175,7 +11236,7 @@ msgstr "Utilitza els noms dels entregadors" #. Resource IDs: (IDS_COMMON_ANCESTOR) msgid "Use common ancestor (A...B diff)" -msgstr "" +msgstr "Utilitza ancestre comú (diff A...B)" #. Resource IDs: (IDS_SMTP_CONFIGURED) msgid "Use configured server" @@ -11194,11 +11255,13 @@ msgstr "Utilitza el bloc de l'esquerra" msgid "Use left file" msgstr "Utilitza fitxer esquerra" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "Utilitza el bloc de text de l'esquerra" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "Utilitza el bloc de text de l'esquerra i després el de la dreta" @@ -11218,11 +11281,12 @@ msgstr "Utilitzar expressió regular " msgid "Use right block" msgstr "Utilitza el bloc de la dreta" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "Utilitza el bloc de text de la dreta" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "Utilitza el bloc de text de la dreta i després el de l'esquerra" @@ -11443,10 +11507,19 @@ msgstr "Mostra .tgitconfig" msgid "View Bars" msgstr "Visualitza les barres" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "Veure pedaç" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11492,8 +11565,8 @@ msgid "Waiting for input" msgstr "Esperant una entrada" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" -msgstr "Comportament al revisar" +msgid "Walk Be&havior" +msgstr "" #. Resource IDs: (IDS_WARN_WARNING) msgid "Warning" @@ -11509,7 +11582,7 @@ msgid "" "Was the merge of\n" "%s\n" "successful?" -msgstr "" +msgstr "Ha reeixit la fusió de\n%s\n?" #. Resource IDs: (IDS_FIRSTSTART_HINT4) msgid "" @@ -11579,6 +11652,20 @@ msgstr "Quan escriviu l'URL, el nom remot s'omplirà automàticament amb \"orige msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "Si fer referència només a etiquetes anotades, a totes les etiquetes o a tots els refs" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11605,6 +11692,10 @@ msgstr "Canvis d'espai en blanc (tabuladors, espais)" msgid "Whitespaces" msgstr "Espais en Blanc" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -11694,7 +11785,7 @@ 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 "" +msgstr "Podeu configurar-ho per a tots els remots o global a la pàgina de configuració del Git." #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" @@ -11717,7 +11808,7 @@ msgstr "No podeu canviar el tipus d'aquesta referència canviant el nom." msgid "" "You did not edit the message template.\n" "Proceed without individual commit message?" -msgstr "" +msgstr "No heu editat la plantilla de missatge.\nContinuar sense cap missatge individual d'entrega?" #. Resource IDs: (IDS_PROC_OLDMSYSGIT) #, c-format @@ -11814,7 +11905,7 @@ msgstr "Z" msgid "" "ZIP archive (*.zip)|*.zip|TAR archive (*.tar)|*.tar|TAR GZIP archive " "(*.tar.gz)|*.tar.gz|All Files (*.*)|*.*||" -msgstr "" +msgstr "fitxer ZIP (*.zip)|*.zip|fitxer TAR (*.tar)|*.tar|fitxer TAR GZIP (*.tar.gz)|*.tar.gz|Tots els fitxers (*.*)|*.*||" #. Resource IDs: (Dialog IDD_EXPORT: Control id 1074) msgid "Zip File" @@ -12034,6 +12125,10 @@ msgstr "fitxer, no un sub-mòdul" msgid "file/foldernames" msgstr "fitxer/noms de carpeta" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "camins complets" @@ -12115,15 +12210,15 @@ msgstr "manager - només aquest dipòsit" #. Resource IDs: (IDS_SYSTEM_GCMCORE) msgid "manager-core - all Windows users" -msgstr "" +msgstr "manager-core - tots els usuaris de Windows" #. Resource IDs: (IDS_GLOBAL_GCMCORE) msgid "manager-core - current Windows user" -msgstr "" +msgstr "manager-core - l'usuari de windows actual" #. Resource IDs: (IDS_LOCAL_GCMCORE) msgid "manager-core - this repository only" -msgstr "" +msgstr "manager-core - només aquest dipòsit" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1494) msgid "master" @@ -12271,10 +12366,6 @@ msgstr "a %1" msgid "to %s" msgstr "a %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "ca&nvis desconeguts" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "setmana" diff --git a/Languages/Tortoise_cs.po b/Languages/Tortoise_cs.po index 46a8b35d9..3b5a02566 100644 --- a/Languages/Tortoise_cs.po +++ b/Languages/Tortoise_cs.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Czech (http://www.transifex.com/lznuaa/tortoisegit/language/cs/)\n" "MIME-Version: 1.0\n" @@ -712,9 +712,10 @@ msgstr "&Písmo pro zprávy protokolu:" msgid "&Font:" msgstr "&Písmo:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "&Vynutit" @@ -1228,6 +1229,10 @@ msgstr "&Slisovat" msgid "&Squash ALL" msgstr "&Slisovat VŠE" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Spustit" @@ -1332,6 +1337,10 @@ msgstr "&Neznámé disky" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "&Nahoru" @@ -1387,14 +1396,14 @@ msgstr "&Ano" msgid "&add \"cherry picked from\"" msgstr "&Přidat \"cherry picked from\"" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "&ignorovat změny mezer" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "&známé změny" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(Výchozí v TortoiseGit)" @@ -2907,6 +2916,10 @@ msgstr "Zavřít aktivní okna a výzvy k uloženi dokumentů" msgid "Collapse" msgstr "Sbalit" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4650,6 +4663,10 @@ msgstr "Spustitelný (+x)" msgid "Exit" msgstr "Ukončit" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Přejít do" @@ -5167,10 +5184,6 @@ msgstr "Vynutit přeskládání i když je současná větev potomkem odevzdán msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "Vynutit: Může dojít k zahození" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5253,6 +5266,10 @@ msgstr "" msgid "Full data" msgstr "Úplná data" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "Fulltextové vyhledávání" @@ -5563,6 +5580,14 @@ msgstr "Skrýt nabídku pro cesty bez verze" msgid "Hide Patch<<" msgstr "Skrýt záplatu<<" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Skrýt skript při spuštění" @@ -6204,6 +6229,13 @@ msgstr "Neplatná měna." msgid "Invalid revision number!" msgstr "Neplatné číslo revize!" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6257,7 +6289,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "Ponechat" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "Ponechat seznamy změn" @@ -6279,7 +6311,7 @@ msgstr "Korejština" msgid "L" msgstr "" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7566,6 +7598,16 @@ msgstr "" msgid "Parent(s)" msgstr "Rodič(ové)" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Heslo" @@ -8524,7 +8566,8 @@ msgstr "Obnovit" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Obnovit výchozí" @@ -8678,11 +8721,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "&Zobrazit změněné soubory v pracovním stromě" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "&Přeskočit nevybrané" @@ -9078,8 +9116,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Vybrat chování dialogového okna postupu po dokončení operace." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9115,7 +9153,8 @@ msgstr "Vyberte který soubor chcete uložit jako\nPoznámka: Zjištěn nevyře #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "&Označit/Odznačit vše" @@ -9448,6 +9487,11 @@ msgstr "Zobrazit protokol..." msgid "Show long format even if a tag is exactly on that commit" msgstr "Zobrazit dlouhý formát i když je značka přímo v odevzdání" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9679,6 +9723,20 @@ msgstr "Skládaný sloupcový graf" msgid "Stacked Line Graph" msgstr "skládaný čárový graf" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Standard" @@ -10639,6 +10697,14 @@ msgstr "Do:" msgid "Toggle filters" msgstr "Přepnout filtry" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10758,8 +10824,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseGitIDiff: nástroj pro zobrazení rozdílů v obrázcích pro TortoiseSVN\n\nDostupné parametry příkazového řádku jsou:\n/left:\"cesta k levému obrázku\"\n/lefttitle:\"název zobrazený u levého obrázku\"\n/right:\"cesta k pravému obrázku\"\n/righttitle:\"název zobrazený u pravého obrázku\"\n/overlay\t\tpro povolení režimu překryvu \n/fit\t\tpřizpůsobit velikosti obrázků\n/showinfo\t\tzobrazit informační rámečky o obrázcích" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10956,6 +11022,11 @@ msgstr "Nelze zapisovat do %1, je pouze pro čtení nebo je otevřen někým jin msgid "Uncheck" msgstr "Odškrtnout" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11029,6 +11100,16 @@ msgstr "Nevyřešené konflikty!" msgid "Unset tracked branch" msgstr "Zrušit sledování větve" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Bez názvu" @@ -11083,30 +11164,10 @@ msgstr "Použít &jednopanelové zobrazení k porovnání 2 souborů" msgid "Use &other text block" msgstr "Použít &druhý textový blok" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Použít textový blok 'můj'" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Použít textový blok 'můj' pak 'jejich'" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Použít textový blok 'jejich'" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Použít textový blok 'jejich' pak 'můj'" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "Použít .mailmap" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "Použít část cesty HTTP" @@ -11192,11 +11253,13 @@ msgstr "Použít blok vlevo" msgid "Use left file" msgstr "Použít levý soubor" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11216,11 +11279,12 @@ msgstr "Použít regulární výraz" msgid "Use right block" msgstr "Použít blok vpravo" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11441,10 +11505,19 @@ msgstr "Zobrazit .tgitconfig" msgid "View Bars" msgstr "Lišty zobrazení" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "Zobrazit záplatu" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11490,8 +11563,8 @@ msgid "Waiting for input" msgstr "Čekání na vstup" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" -msgstr "&Chování průchodu" +msgid "Walk Be&havior" +msgstr "" #. Resource IDs: (IDS_WARN_WARNING) msgid "Warning" @@ -11577,6 +11650,20 @@ msgstr "Když zadáte URL, název vzdálené větve bude automaticky zadán jako msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "Zdali odkazovat pouze na anotované značky, všechny značky nebo všechny odkazy" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11603,6 +11690,10 @@ msgstr "Změny mezer (tabulátory, mezerníky)" msgid "Whitespaces" msgstr "Mezery" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12032,6 +12123,10 @@ msgstr "" msgid "file/foldernames" msgstr "soubor/názvy složek" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "úplné cesty" @@ -12269,10 +12364,6 @@ msgstr "do %1" msgid "to %s" msgstr "do %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "&neznámé změny" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "týden" diff --git a/Languages/Tortoise_da.po b/Languages/Tortoise_da.po index 287caf5fa..1175b092f 100644 --- a/Languages/Tortoise_da.po +++ b/Languages/Tortoise_da.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Danish (http://www.transifex.com/lznuaa/tortoisegit/language/da/)\n" "MIME-Version: 1.0\n" @@ -710,9 +710,10 @@ msgstr "&Skrifttype til logbeskeder:" msgid "&Font:" msgstr "&Skrifttype:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "" @@ -1226,6 +1227,10 @@ msgstr "" msgid "&Squash ALL" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "" @@ -1330,6 +1335,10 @@ msgstr "&Ukendte drev" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "" @@ -1385,12 +1394,12 @@ msgstr "" msgid "&add \"cherry picked from\"" msgstr "" -#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) -msgid "&ignore space change" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" +#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) +msgid "&ignore space change" msgstr "" #. Resource IDs: (IDS_TORTOISEGITDEFAULT) @@ -2905,6 +2914,10 @@ msgstr "Lukker det aktive vindue og spørger, om dokumenterne skal gemmes" msgid "Collapse" msgstr "Kollaps" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4648,6 +4661,10 @@ msgstr "" msgid "Exit" msgstr "Afslut" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Åbn i Stifinder" @@ -5165,10 +5182,6 @@ msgstr "" msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5251,6 +5264,10 @@ msgstr "" msgid "Full data" msgstr "Alle data" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "" @@ -5561,6 +5578,14 @@ msgstr "Skjul menuer for uversionerede stier" msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Skjul scriptet under kørsel" @@ -6202,6 +6227,13 @@ msgstr "Ugyldig Valuta." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6255,7 +6287,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "" @@ -6277,7 +6309,7 @@ msgstr "" msgid "L" msgstr "" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7564,6 +7596,16 @@ msgstr "" msgid "Parent(s)" msgstr "" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Adgangskode" @@ -8522,7 +8564,8 @@ msgstr "Gendan" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Gendan standard" @@ -8676,11 +8719,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9076,8 +9114,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Vælg, hvordan fremskridtsdialogen skal opføre sig, når handlingen er afsluttet." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9113,7 +9151,8 @@ msgstr "Vælg hvilken fil du vil gemme som\nBemærk: Der er uløste konflikter!" #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "" @@ -9446,6 +9485,11 @@ msgstr "" msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9677,6 +9721,20 @@ msgstr "Stablet søjlediagram" msgid "Stacked Line Graph" msgstr "Stablet kurvediagram" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Standard" @@ -10637,6 +10695,14 @@ msgstr "Til:" msgid "Toggle filters" msgstr "" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10756,8 +10822,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10954,6 +11020,11 @@ msgstr "Der kan ikke skrives til %1. Filen er enten skrivebeskyttet eller allere msgid "Uncheck" msgstr "Fravælg" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11027,6 +11098,16 @@ msgstr "Uløste konflikter!" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Ikke-navngivet" @@ -11081,30 +11162,10 @@ msgstr "Benyt &enkelt-panel-visning som standard for 2-fils-sammenligning" msgid "Use &other text block" msgstr "Benyt den &anden tekstblok" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Brug 'min' tekst blok" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Brug først 'min' og dernæst 'deres' tekst blok" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Brug 'deres' tekst blok" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Brug først 'deres' og dernæst 'min' tekst blok" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11190,11 +11251,13 @@ msgstr "Brug venstre blok" msgid "Use left file" msgstr "Benyt venstre fil" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11214,11 +11277,12 @@ msgstr "Benyt regulært udtryk" msgid "Use right block" msgstr "Brug højre blok" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11439,10 +11503,19 @@ msgstr "" msgid "View Bars" msgstr "" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11488,7 +11561,7 @@ msgid "Waiting for input" msgstr "" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11575,6 +11648,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11601,6 +11688,10 @@ msgstr "Blanktegns-ændringer (tabulator, mellemrum)" msgid "Whitespaces" msgstr "Blanktegn" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12030,6 +12121,10 @@ msgstr "" msgid "file/foldernames" msgstr "filer/foldernavne" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "fulde stier" @@ -12267,10 +12362,6 @@ msgstr "til %1" msgid "to %s" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "uge" diff --git a/Languages/Tortoise_de.po b/Languages/Tortoise_de.po index 6b6dc2c7d..c7ddccbbb 100644 --- a/Languages/Tortoise_de.po +++ b/Languages/Tortoise_de.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -15,10 +15,10 @@ # Lübbe Onken , 2011-2012, 2013-2016, 2017 # Lübbe Onken , 2012 # Lübbe Onken , 2012,2018 -# Obareo, 2019 +# Obareo, 2019,2021 # peu , 2013 # Stefan Kueng , 2014 -# Sven Strickroth , 2012-2021 +# Sven Strickroth , 2012-2022 # 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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-15 14:38+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: German (http://www.transifex.com/lznuaa/tortoisegit/language/de/)\n" "MIME-Version: 1.0\n" @@ -720,9 +720,10 @@ msgstr "&Schrift für Logmeldungen:" msgid "&Font:" msgstr "&Schriftart:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "Er&zwingen" @@ -1236,6 +1237,10 @@ msgstr "&Zusammenfassen" msgid "&Squash ALL" msgstr "ALLE &Zusammenfassen" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "&Staging" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Start" @@ -1340,6 +1345,10 @@ msgstr "&Unbekannte Laufwerke" msgid "&Unlock" msgstr "&Entsperren" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "&Unstaging" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "&Hoch" @@ -1395,14 +1404,14 @@ msgstr "&Ja" msgid "&add \"cherry picked from\"" msgstr "füge \"cherry picked from\" &hinzu" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "&zwingen" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "&Ignoriere Änderungen in der Anzahl von Leerzeichen" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "&bekannte Änderungen" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(TortoiseGit Standard)" @@ -2915,6 +2924,10 @@ msgstr "Schließt das aktive Fenster und fragt nach, ob die Daten gespeichert we msgid "Collapse" msgstr "Einklappen" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "Revisionen zusammenfassen" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4658,6 +4671,10 @@ msgstr "Ausführbar (+x)" msgid "Exit" msgstr "Beenden" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "Zusammengefasste Revisionen erweitern" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Explorer öffnen" @@ -5175,10 +5192,6 @@ msgstr "Zwinge das neu Aufbauen, selbst wen der aktuelle Zweig ein Nachkomme der msgid "Force unlock" msgstr "Zwangsentsperren" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "Erzwingen: Mit möglichem Verlust von" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5261,6 +5274,10 @@ msgstr "Vollständige Revisionsdaten ohne geänderte Pfade" msgid "Full data" msgstr "Vollständige Daten" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "Full-History" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "Volltextsuche" @@ -5571,6 +5588,14 @@ msgstr "Kontextmenü für nicht versionierte Objekte verbergen" msgid "Hide Patch<<" msgstr "Patch verstecken<<" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "Verstecke Staging<<" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "Verstecke Unstaging<<" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Skript beim Ablauf verbergen" @@ -6212,6 +6237,13 @@ msgstr "Ungültige Währung" msgid "Invalid revision number!" msgstr "Ungültige Revisionsangabe." +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "Ungültige Auswahl.\n\nWenn es sich um eine einzeilige Datei handelt, die geändert wurde, müssen Sie das Kontrollkästchen anklicken, um die gesamte Datei in den Zustand zu versetzen oder den Zustand aufzuheben." + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "Integration des Fehlerverfolgungssystems" @@ -6265,7 +6297,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "Behalten" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "Änderungsliste beibehalten" @@ -6287,7 +6319,7 @@ msgstr "Koreanisch" msgid "L" msgstr "U" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "LFS" @@ -7574,6 +7606,16 @@ msgstr "Elter von %2!s!" msgid "Parent(s)" msgstr "Elternteil(e)" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "Partielles Staging>>" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "Partielles Unstaging>>" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Passwort" @@ -8532,7 +8574,8 @@ msgstr "Wiederherstellen" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Standard wiederherstellen" @@ -8686,11 +8729,6 @@ msgstr "Ausführen, wenn sich der Arbeitsbaum unter dem folgenden Pfad befindet: msgid "S" msgstr "S" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "&Zeige geänderte Dateien im Arbeitsbaum" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "Nicht ausgewählte i&gnorieren" @@ -9086,8 +9124,8 @@ msgstr "Entfernte Referenz wählen - TortoiseGit" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Bestimmen Sie, wie sich die Fortschrittsanzeige am Ende einer Aktion verhalten soll." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "Wähle das Verhalten des Progress-Dialogs am Ende der Operation." #. Resource IDs: (57642) msgid "" @@ -9123,7 +9161,8 @@ msgstr "Wählen Sie, welche Datei Sie speichern wollen\nHinweis: Es gibt noch au #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "&Alle wählen/abwählen" @@ -9456,6 +9495,11 @@ msgstr "Zeige Log..." msgid "Show long format even if a tag is exactly on that commit" msgstr "Verwende das lange Log Format selbst wenn eine Markierung genau auf die Eintragung zeigt" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "&Geänderte Dateien im Arbeitsbaum anzeigen" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9687,6 +9731,20 @@ msgstr "Gestapelte Balken" msgid "Stacked Line Graph" msgstr "Gestapelte Linien" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "Stage gewählten A&bschnitt" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "Stage markierte &Zeilen" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "Staging unterstützung (EXPERIMENTELL)" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Standard" @@ -10647,6 +10705,14 @@ msgstr "Bis:" msgid "Toggle filters" msgstr "Filter an/abschalten" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "Zu viele Dateien um diese anzuzeigen." + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "Oberstes Kontextmenü in WIndows 11" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10766,8 +10832,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseGitIDiff: Das Programm zum Vergleichen von Bildern\n\nKommandozeilenparameter sind:\n/left:'Pfad zum linken Bild'\n/lefttitle:'Titel für linkes Bild'\n/right:'Pfad zum rechten Bild'\n/righttitle:'Titel für rechtes Bild'/overlay\t\tAktiviert die Überlagerung\n/fit\t\tGleicht die Bildgrößen an\n/showinfo\t\tZeigt die Bildinformationen an" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10964,6 +11030,11 @@ msgstr "Konnte auf %1 nicht schreiben, es ist entweder schreibgeschützt oder vo msgid "Uncheck" msgstr "Abwählen" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "Nicht markierte Einträge werden nicht im oberen Menü angezeigt, sondern nur im ursprünglichen Menü" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11037,6 +11108,16 @@ msgstr "Nicht aufgelöste Konflikte!" msgid "Unset tracked branch" msgstr "Beobachteten entfernten Zweig nicht mehr beobachten" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "Unstage gewählten A&bschnitt" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "Unstage markierte &Zeilen" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Unbenannt" @@ -11091,30 +11172,10 @@ msgstr "Verwende &Einfenstersicht als Standard für Zweiwegevergleich" msgid "Use &other text block" msgstr "Verwende &anderen Textblock" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Verwende 'meinen' Textblock" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Verwende 'meinen' Textblock vor 'deren'" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Verwende 'deren' Textblock" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Verwende 'deren' Textblock vor 'meinem'" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "Benutze .mailmap" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "Beachte HTTP Pfadkomponente" @@ -11200,11 +11261,13 @@ msgstr "Verwende linken Block" msgid "Use left file" msgstr "Verwende linke Datei" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "Verwende linken Textblock" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "Verwende linken Textblock vor rechtem" @@ -11224,11 +11287,12 @@ msgstr "Verwende reguläre Ausdrücke" msgid "Use right block" msgstr "Verwende den rechten Block" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "Verwende rechten Textblock" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "Verwende rechten Textblock vor linkem" @@ -11449,10 +11513,19 @@ msgstr ".tgitconfig ansehen" msgid "View Bars" msgstr "Leisten" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "Patch anzeigen" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "Zeige Patch - HEAD zum Index" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "Zeige Patch - Index zum Arbeitsbaum" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11498,8 +11571,8 @@ msgid "Waiting for input" msgstr "Warte auf Eingabe" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" -msgstr "&Traversierungsart" +msgid "Walk Be&havior" +msgstr "&Suchmethode" #. Resource IDs: (IDS_WARN_WARNING) msgid "Warning" @@ -11585,6 +11658,20 @@ msgstr "Wenn Sie einen URL eingeben wird der Name des entfernten Repositories au msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "Ob nur kommentierte Markierungen oder alle Markierungen und Referenzen referenziert werden sollen" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "In diesem Modus zeigt das Kontrollkästchen für jede Datei ihren Stagingstatus an:\n- Aktiviert bedeutet, dass alle Änderungen an der Datei gestaged sind.\n- Nicht markiert bedeutet, dass alle Änderungen an der Datei nicht gestaged sind.\n- Ein graues Quadrat bedeutet, dass nur einige Änderungen für die Datei gestaged sind.\n\nWenn Sie die Kontrollkästchen anklicken, wird die gesamte Datei sofort gestaged oder unstaged.\n\nSie können auch auf \"Partielles Staging\" oder \"Partielles Unstaging\" klicken. Es wird ein Fenster angezeigt, in dem Sie Abschnitte oder Zeilen in der aktuell ausgewählten Datei stagen oder unstagen können.\n\nBitte beachten Sie, dass aus Leistungsgründen die Gruppe (Geänderte Dateien, Nicht versionierte Dateien...) und der Status (Hinzugefügt, Geändert, Unbekannt...) der Datei nicht aktualisiert werden, wenn Sie auf das Kontrollkästchen klicken. Wenn Sie die aktualisierte Gruppe und den aktualisierten Stati sehen möchten, können Sie eine vollständige Aktualisierung auslösen, indem Sie F5 drücken." + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11611,6 +11698,10 @@ msgstr "Whitespace-Änderungen (Tabs, Leerzeichen)" msgid "Whitespaces" msgstr "Leerzeichen" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "Windows 11 Kontextmenü" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12040,6 +12131,10 @@ msgstr "Datei, kein Submodul" msgid "file/foldernames" msgstr "Datei-/Verzeichnisnamen" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "erz&wingen \"with lease\"" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "Volle Pfade" @@ -12277,10 +12372,6 @@ msgstr "nach %1" msgid "to %s" msgstr "nach %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "&unbekannte Änderungen" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "Woche" diff --git a/Languages/Tortoise_el.po b/Languages/Tortoise_el.po index c9a921318..1bac4a542 100644 --- a/Languages/Tortoise_el.po +++ b/Languages/Tortoise_el.po @@ -1,10 +1,11 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # # Translators: # Falital , 2018 +# George Vrakas , 2021 # Falital , 2017 # Stavros , 2011,2014,2017 # Sven Strickroth , 2020 @@ -14,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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Greek (http://www.transifex.com/lznuaa/tortoisegit/language/el/)\n" "MIME-Version: 1.0\n" @@ -103,7 +104,7 @@ msgstr "%1!d! λεπτό πριν" #. Resource IDs: (IDS_MONTH_AGO) #, c-format msgid "%1!d! Month ago" -msgstr "%1!d! μηνά πριν" +msgstr "%1!d! μήνα πριν" #. Resource IDs: (IDS_MONTHS_AGO) #, c-format @@ -708,9 +709,10 @@ msgstr "&Γραμματοσειρά για τα μηνύματα ιστορικ msgid "&Font:" msgstr "&Γραμματοσειρά:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "Αναγκασμός" @@ -1224,6 +1226,10 @@ msgstr "&Πολτοποίησε " msgid "&Squash ALL" msgstr "&Πολτοποίησε Όλα " +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Έναρξης" @@ -1328,6 +1334,10 @@ msgstr "&Άγνωστοι οδηγοί συσκευών" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "&Πανω" @@ -1383,14 +1393,14 @@ msgstr "&Ναι " msgid "&add \"cherry picked from\"" msgstr "&προσθήκη \"επιλεκτικά επιλεγμένου από\"" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "&Παράβλεψη αλλαγών σε κενά διαστήματα" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "&Γνωστές αλλαγές " - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(TortoiseGit Προκαθορισμένο)" @@ -2903,6 +2913,10 @@ msgstr "Κλείνει το ενεργό παράθυρο και προτρέπ msgid "Collapse" msgstr "Κατάρρευση" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4646,6 +4660,10 @@ msgstr "Εκτελέσιμο (+ x)" msgid "Exit" msgstr "Έξοδος" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Εξερεύνηση προς" @@ -5163,10 +5181,6 @@ msgstr "Αναγκαστική Επαναφορά κλάδου ακόμα και msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5249,6 +5263,10 @@ msgstr "" msgid "Full data" msgstr "" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "" @@ -5559,6 +5577,14 @@ msgstr "" msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Απόκρυψη του αρχείου όσο αυτό εκτελείται" @@ -6200,6 +6226,13 @@ msgstr "Μη έγκυρο νόμισμα." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6253,7 +6286,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "" @@ -6275,7 +6308,7 @@ msgstr "" msgid "L" msgstr "" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7562,6 +7595,16 @@ msgstr "" msgid "Parent(s)" msgstr "" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "" @@ -8520,7 +8563,8 @@ msgstr "" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Επαναφορά προεπιλογών" @@ -8674,11 +8718,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9074,8 +9113,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Επιλέξτε τη συμπεριφορά του διαλόγου προόδου στο τέλος της διεργασίας." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9111,7 +9150,8 @@ msgstr "" #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "" @@ -9444,6 +9484,11 @@ msgstr "" msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9675,6 +9720,20 @@ msgstr "" msgid "Stacked Line Graph" msgstr "" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Κανονικό" @@ -10635,6 +10694,14 @@ msgstr "Προς:" msgid "Toggle filters" msgstr "" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10754,8 +10821,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10952,6 +11019,11 @@ msgstr "" msgid "Uncheck" msgstr "Αποεπιλογή" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11025,6 +11097,16 @@ msgstr "" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Ατιτλοφόρητο" @@ -11079,30 +11161,10 @@ msgstr "" msgid "Use &other text block" msgstr "Χρήση &διαφορετικού μπλοκ κειμένου" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11188,11 +11250,13 @@ msgstr "" msgid "Use left file" msgstr "Χρήση αριστερού αρχείου" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11212,11 +11276,12 @@ msgstr "Χρήση κοινών εκφράσεων" msgid "Use right block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11437,10 +11502,19 @@ msgstr "" msgid "View Bars" msgstr "" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11486,7 +11560,7 @@ msgid "Waiting for input" msgstr "" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11573,6 +11647,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11599,6 +11687,10 @@ msgstr "" msgid "Whitespaces" msgstr "Κενά" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12028,6 +12120,10 @@ msgstr "" msgid "file/foldernames" msgstr "ονόματα αρχείων/φακέλων" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "πλήρεις διαδρομές" @@ -12265,10 +12361,6 @@ msgstr "σε %1" msgid "to %s" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "εβδομάδα" diff --git a/Languages/Tortoise_es.po b/Languages/Tortoise_es.po index 0a787077e..098728362 100644 --- a/Languages/Tortoise_es.po +++ b/Languages/Tortoise_es.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -27,6 +27,7 @@ # Roberto Gómez, 2017 # Roberto Gómez, 2017 # strel, 2015-2018 +# Sven Strickroth , 2021 # TempEmail.net , 2013 # Thomas Armstrong , 2013 msgid "" @@ -34,7 +35,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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Spanish (http://www.transifex.com/lznuaa/tortoisegit/language/es/)\n" "MIME-Version: 1.0\n" @@ -728,9 +729,10 @@ msgstr "&Fuente mensajes de Reg.:" msgid "&Font:" msgstr "&Fuente:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "&Forzar" @@ -1244,6 +1246,10 @@ msgstr "&Compactar (squash)" msgid "&Squash ALL" msgstr "&Compactar (squash) TODO" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Iniciar" @@ -1348,6 +1354,10 @@ msgstr "&Unidades desconocidas" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "&Arriba" @@ -1403,14 +1413,14 @@ msgstr "&Sí" msgid "&add \"cherry picked from\"" msgstr "&añadir \"elemento tomado de\"" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "&Ignorar cámbios de espacios" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "&cambios conocidos" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(TortoiseGit predeterminado)" @@ -2137,7 +2147,7 @@ msgstr "Auto convertir 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" @@ -2163,7 +2173,7 @@ msgstr "Auto-completar palabra sugerida (generalmente clases, nombres de miembro #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) msgid "AutoCrLf:" -msgstr "" +msgstr "AutoCrLf:" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" @@ -2923,6 +2933,10 @@ msgstr "Cerrar la ventana activa, e indicar que guarde los documentos" msgid "Collapse" msgstr "Contraer" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -2941,15 +2955,15 @@ msgstr "Colores" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) msgid "Colors 1" -msgstr "" +msgstr "Colores 1" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) msgid "Colors 2" -msgstr "" +msgstr "Colores 2" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) msgid "Colors 3" -msgstr "" +msgstr "Colores 3" #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format @@ -3229,11 +3243,11 @@ msgstr "Conflictos: %d" #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) msgid "Context Menu" -msgstr "" +msgstr "Menú contextual" #. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) msgid "Context Menu 2" -msgstr "" +msgstr "Menú contextual 2" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" @@ -3360,7 +3374,7 @@ msgid "" "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 "" +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\"." #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) #, c-format @@ -3592,7 +3606,7 @@ msgstr "Creando petición de incorporación (pull)..." #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) msgid "Credential" -msgstr "" +msgstr "Credencial" #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." @@ -3914,15 +3928,15 @@ msgstr "Cuadros de diálogo" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) msgid "Dialogs 1" -msgstr "" +msgstr "Diálogos 1" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) msgid "Dialogs 2" -msgstr "" +msgstr "Diálogos 2" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) msgid "Dialogs 3" -msgstr "" +msgstr "Diálogos 3" #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" @@ -4666,6 +4680,10 @@ msgstr "Ejecutable (+x)" msgid "Exit" msgstr "Salir" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Explora ubicación" @@ -5183,10 +5201,6 @@ msgstr "Forzar el reasentado (rebase), incluso si el ramal actual es un descendi msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "Forzar: Podría descartar" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5205,14 +5219,14 @@ msgstr "Reenviar %d" msgid "" "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 "" +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\"." #. 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 running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." -msgstr "" +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." #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) msgid "" @@ -5269,6 +5283,10 @@ msgstr "Datos de consignación (commit) completos sin rutas cambiadas" msgid "Full data" msgstr "Datos completos" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "Búsquedas de texto completo" @@ -5579,6 +5597,14 @@ msgstr "Ocultar Menús para rutas sin versionar" msgid "Hide Patch<<" msgstr "Ocultar Parche<<" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Ocultar sec. de comandos mientras se ejecuta" @@ -6220,13 +6246,20 @@ msgstr "Divisa no válida," msgid "Invalid revision number!" msgstr "¡Número de revisión no válido!" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" -msgstr "" +msgstr "Configuración del rastreador de problemas" #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) msgid "Issue Tracker Integration" -msgstr "" +msgstr "Integración del rastreador de problemas" #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" @@ -6273,7 +6306,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "Conservar" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "Mantener listas de cambios" @@ -6295,7 +6328,7 @@ msgstr "Coreano" msgid "L" msgstr "L" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "LFS" @@ -6710,7 +6743,7 @@ msgstr "Reintegración de combinación (merge)" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) msgid "Merge Tool" -msgstr "" +msgstr "Herramienta de combinación (merge)" #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" @@ -7497,7 +7530,7 @@ msgstr "Salida.impr" #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) msgid "Overlay Handlers" -msgstr "" +msgstr "Controladores de Superpuestos" #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" @@ -7582,6 +7615,16 @@ msgstr "¡Antecesor de %2!s!" msgid "Parent(s)" msgstr "Antecessor(es)" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Contraseña" @@ -8540,7 +8583,8 @@ msgstr "Restaurar" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Restaurar por defecto" @@ -8694,11 +8738,6 @@ msgstr "Ejecutar cuando la ruta del árbol de trabajo esté bajo:" msgid "S" msgstr "S" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "&Mostrar ficheros modificados en el árbol de trabajo" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "O&mitir no seleccionados" @@ -8782,7 +8821,7 @@ msgstr "Se&guroCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) msgid "SafeCrLf:" -msgstr "" +msgstr "SafeCrLf:" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -8976,7 +9015,7 @@ msgstr "Datos Guardados" #. Resource IDs: (IDS_PROC_SAVECONFIGFAILED) #, c-format msgid "Saving config failed (key: \"%1!s!\", value: \"%2!s!\")." -msgstr "" +msgstr "Fallo al guardar configuración (clave: \"%1!s!\", valor: \"%2!s!\")." #. Resource IDs: (IDS_PROC_FAILEDSAVINGNOTES) msgid "Saving notes failed." @@ -9094,8 +9133,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Seleccionar como proceder el diálogo de progreso al final de la operación." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9131,7 +9170,8 @@ msgstr "Seleccione qué fichero quiere guardar como\nNota: ¡Hay un conflicto no #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "Seleccionar/deseleccionar &todo" @@ -9464,6 +9504,11 @@ msgstr "Mostrar reg..." msgid "Show long format even if a tag is exactly on that commit" msgstr "Mostrar formato largo incluso si una etiqueta está exactamente en esa consignación (commit)" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9695,6 +9740,20 @@ msgstr "Gráfico de barras apilado" msgid "Stacked Line Graph" msgstr "Gráfico de líneas apilado" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Estándar" @@ -10655,6 +10714,14 @@ msgstr "A:" msgid "Toggle filters" msgstr "Accionar filtros" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10750,7 +10817,7 @@ msgid "" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "" +msgstr "TortoiseGitBlame\n\nTortoiseGitBlame\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10774,8 +10841,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseGitIDiff: visor en pantalla Diff de TortoiseSVN\n\nParámetros disponibles en línea de comandos son:\n/left:\"ruta de la imagen izquierda\"\n/lefttitle:\"título para mostrar en la imagen izquierda\"\n/right:\"ruta de la imagen derecha\"\n/righttitle:\"título para mostrar en la imagen derecha\"\n/overlay\t\t para habilitar modo sobrepuesto\n/fit\t\t para ajustarse al tamaño de las imágeness\n/showinfo\t\t para mostrar los cuadros de información de imagen" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10972,6 +11039,11 @@ msgstr "No se pudo escribir %1, es de solo-lectura ó está abierto por otro." msgid "Uncheck" msgstr "Desmarcar" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11045,6 +11117,16 @@ msgstr "¡Conflictos no resueltos!" msgid "Unset tracked branch" msgstr "Vaciar la configuración del ramal (branch) en seguimiento" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Sin título" @@ -11099,30 +11181,10 @@ msgstr "Usar &un-panel como vista predeterminada para 2-archivos dif." msgid "Use &other text block" msgstr "Usar &otro bloque de texto" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Usa 'mi' bloque de texto" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Usa 'mi' bloque de texto en lugar de el de 'ellos'" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Usa 'su' bloque de texto" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Usa 'su' bloque de texto en lugar del 'mio'" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "Usar .mailmap" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "Usar el componente de ruta HTTP" @@ -11208,11 +11270,13 @@ msgstr "Usar bloque izq" msgid "Use left file" msgstr "Usar archivo Izqi" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "Usar el bloque de texto izquierdo" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "Usar el bloque de texto izquierdo y luego el derecho" @@ -11232,11 +11296,12 @@ msgstr "Usar expresiones regulares" msgid "Use right block" msgstr "Usar el bloque de la derecha" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "Usar el bloque de texto derecho" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "Usar el bloque de texto derecho y luego el izquierdo" @@ -11457,10 +11522,19 @@ msgstr "Ver .tgitconfig" msgid "View Bars" msgstr "Barras de vista" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "Vista Parche" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11506,8 +11580,8 @@ msgid "Waiting for input" msgstr "Esperando una entrada" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" -msgstr "Comportamiento en marcha" +msgid "Walk Be&havior" +msgstr "" #. Resource IDs: (IDS_WARN_WARNING) msgid "Warning" @@ -11593,6 +11667,20 @@ msgstr "Cuando teclea la URL, el nombre remoto se rellenará automáticamente co msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "Si se referencian sólo etiquetas anotaas, todas las etiquetas o todas las referencias" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11619,6 +11707,10 @@ msgstr "Cambios de espacios en blanco (tabulaciones, espacios)" msgid "Whitespaces" msgstr "Espacios en blanco" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12048,6 +12140,10 @@ msgstr "fichero, no un submódulo" msgid "file/foldernames" msgstr "fichero/nombresdecarpeta" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "rutas completas" @@ -12117,27 +12213,27 @@ msgstr "línea: %d(+) %d(-) archivos: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s #. Resource IDs: (IDS_SYSTEM_GCM) msgid "manager - all Windows users" -msgstr "gestor - todos los usuarios de Windows" +msgstr "manager - todos los usuarios de Windows" #. Resource IDs: (IDS_GLOBAL_GCM) msgid "manager - current Windows user" -msgstr "gestor - usuario actual de Windows" +msgstr "manager - usuario actual de Windows" #. Resource IDs: (IDS_LOCAL_GCM) msgid "manager - this repository only" -msgstr "gestor - solo este repositorio" +msgstr "manager - sólo este repositorio" #. Resource IDs: (IDS_SYSTEM_GCMCORE) msgid "manager-core - all Windows users" -msgstr "" +msgstr "manager-core - todos los usuarios de Windows" #. Resource IDs: (IDS_GLOBAL_GCMCORE) msgid "manager-core - current Windows user" -msgstr "" +msgstr "manager-core - usuario actual de Windows" #. Resource IDs: (IDS_LOCAL_GCMCORE) msgid "manager-core - this repository only" -msgstr "" +msgstr "manager-core - sólo este repositorio" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1494) msgid "master" @@ -12285,10 +12381,6 @@ msgstr "a %1" msgid "to %s" msgstr "a %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "cambios de&sconocidos" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "semana" diff --git a/Languages/Tortoise_fa.po b/Languages/Tortoise_fa.po index e17d4a7d3..c38802bd9 100644 --- a/Languages/Tortoise_fa.po +++ b/Languages/Tortoise_fa.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Persian (http://www.transifex.com/lznuaa/tortoisegit/language/fa/)\n" "MIME-Version: 1.0\n" @@ -711,9 +711,10 @@ msgstr "&قلم پیام‌های گزارش:" msgid "&Font:" msgstr "&قلم:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "تحمیل" @@ -1227,6 +1228,10 @@ msgstr "" msgid "&Squash ALL" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "شروع" @@ -1331,6 +1336,10 @@ msgstr "&درایوهای ناشناخته" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "&بالا" @@ -1386,14 +1395,14 @@ msgstr "&بله" msgid "&add \"cherry picked from\"" msgstr "" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "تغییرات معلوم" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "" @@ -2906,6 +2915,10 @@ msgstr "بستن پنجره فعال واعلان جهت ذخیره سازی س msgid "Collapse" msgstr "فروپاشی" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4649,6 +4662,10 @@ msgstr "" msgid "Exit" msgstr "خروج" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "مرور به" @@ -5166,10 +5183,6 @@ msgstr "" msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5252,6 +5265,10 @@ msgstr "" msgid "Full data" msgstr "" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "" @@ -5562,6 +5579,14 @@ msgstr "پنهان سازی منوها برای مسیرهای فاقد نسخه msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "پنهان سازی اسکریپت در حین اجراء" @@ -6203,6 +6228,13 @@ msgstr "واحد پولی نامعتبر." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6256,7 +6288,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "نگاه داشتن" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "نگهداری از فهرست تغییرات" @@ -6278,7 +6310,7 @@ msgstr "کره ای" msgid "L" msgstr "" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7565,6 +7597,16 @@ msgstr "" msgid "Parent(s)" msgstr "" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "" @@ -8523,7 +8565,8 @@ msgstr "بازیافت" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "بازنشانی پیش فرض" @@ -8677,11 +8720,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9077,8 +9115,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "نحوه رفتار پنجره پیشرفت را در پایان عملیات انتخاب نمایید" +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9114,7 +9152,8 @@ msgstr "" #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "" @@ -9447,6 +9486,11 @@ msgstr "" msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9678,6 +9722,20 @@ msgstr "نمودار میله پشته ای" msgid "Stacked Line Graph" msgstr "نمودار خطی پشته ای" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "استاندارد" @@ -10638,6 +10696,14 @@ msgstr "به:" msgid "Toggle filters" msgstr "" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10757,8 +10823,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10955,6 +11021,11 @@ msgstr "عدم موفقیت در نوشتن به %1، این قلم فقط-خو msgid "Uncheck" msgstr "برداشتن تیک" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11028,6 +11099,16 @@ msgstr "برخوردهای حل نشده!" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "فاقد عنوان" @@ -11082,30 +11163,10 @@ msgstr "Use &one-pane view as default for 2-file diff" msgid "Use &other text block" msgstr "استفاده از بلوک متنی &دیگر" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11191,11 +11252,13 @@ msgstr "" msgid "Use left file" msgstr "استفاده از فایل سمت چپ" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11215,11 +11278,12 @@ msgstr "استفاده از عبارت با قاعده" msgid "Use right block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11440,10 +11504,19 @@ msgstr "" msgid "View Bars" msgstr "" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11489,7 +11562,7 @@ msgid "Waiting for input" msgstr "انتظار برای ورودی" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11576,6 +11649,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11602,6 +11689,10 @@ msgstr "" msgid "Whitespaces" msgstr "حروف خالی" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12031,6 +12122,10 @@ msgstr "" msgid "file/foldernames" msgstr "" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "" @@ -12268,10 +12363,6 @@ msgstr "به %1" msgid "to %s" msgstr "به %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "هفته" diff --git a/Languages/Tortoise_fi.po b/Languages/Tortoise_fi.po index 063d7eeb3..1df856fcf 100644 --- a/Languages/Tortoise_fi.po +++ b/Languages/Tortoise_fi.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Finnish (http://www.transifex.com/lznuaa/tortoisegit/language/fi/)\n" "MIME-Version: 1.0\n" @@ -710,9 +710,10 @@ msgstr "Lokiviestien &kirjasin:" msgid "&Font:" msgstr "&Kirjasin:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "" @@ -1226,6 +1227,10 @@ msgstr "" msgid "&Squash ALL" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "" @@ -1330,6 +1335,10 @@ msgstr "&Tuntemattomat asemat" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "" @@ -1385,12 +1394,12 @@ msgstr "" msgid "&add \"cherry picked from\"" msgstr "" -#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) -msgid "&ignore space change" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" +#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) +msgid "&ignore space change" msgstr "" #. Resource IDs: (IDS_TORTOISEGITDEFAULT) @@ -2905,6 +2914,10 @@ msgstr "Sulkee aktiivisen ikkunan ja pyytää tallettamaan tiedostot" msgid "Collapse" msgstr "Sulje" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4648,6 +4661,10 @@ msgstr "" msgid "Exit" msgstr "Lopeta" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Siirry" @@ -5165,10 +5182,6 @@ msgstr "" msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5251,6 +5264,10 @@ msgstr "" msgid "Full data" msgstr "Kaikki tiedot" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "" @@ -5561,6 +5578,14 @@ msgstr "Piilota valikot versioimattomille poluille" msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Piilota komento sen suorituksen ajaksi" @@ -6202,6 +6227,13 @@ msgstr "Laiton rahayksikkö." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6255,7 +6287,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "" @@ -6277,7 +6309,7 @@ msgstr "" msgid "L" msgstr "" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7564,6 +7596,16 @@ msgstr "" msgid "Parent(s)" msgstr "" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Salasana" @@ -8522,7 +8564,8 @@ msgstr "Palauta" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Palauta oletusarvot" @@ -8676,11 +8719,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9076,8 +9114,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Määritä edistymisestä kertovan ikkunan toiminta operaation päättyessä." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9113,7 +9151,8 @@ msgstr "Valitse minkä tiedoston haluat tallettaa nimellä\nHuom! Ratkaisemattom #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "" @@ -9446,6 +9485,11 @@ msgstr "" msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9677,6 +9721,20 @@ msgstr "Pinottu pylväsgraafi" msgid "Stacked Line Graph" msgstr "Pinottu viivagraafi" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Vakio" @@ -10637,6 +10695,14 @@ msgstr "Mihin:" msgid "Toggle filters" msgstr "" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10756,8 +10822,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10954,6 +11020,11 @@ msgstr "Tiedostoon %1 kirjoitus ei onnistu, joko siihen on vain lukuoikeus tai j msgid "Uncheck" msgstr "Poista valinta" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11027,6 +11098,16 @@ msgstr "Ratkaisemattomia ristiriitoja!" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Nimetön" @@ -11081,30 +11162,10 @@ msgstr "Käytä &yhtä paneelia kahden tiedoston vertailuun" msgid "Use &other text block" msgstr "Käytä &toista tekstilohkoa" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Käytä 'minun' tekstilohkoani" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Käytä 'minun' tekstilohkoani ja sitten 'heidän'" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Käytä 'heidän' tekstilohkoaan" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Käytä 'heidän' tekstilohkonsa ja sitten 'minun'" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11190,11 +11251,13 @@ msgstr "Käytä vasenta lohkoa" msgid "Use left file" msgstr "Käytä vasen tiedosto" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11214,11 +11277,12 @@ msgstr "Käytä säännöllistä lauseketta" msgid "Use right block" msgstr "Käytä oikeaa lohkoa" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11439,10 +11503,19 @@ msgstr "" msgid "View Bars" msgstr "Näytä palkit" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11488,7 +11561,7 @@ msgid "Waiting for input" msgstr "" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11575,6 +11648,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11601,6 +11688,10 @@ msgstr "Tyhjämerkkimuutokset (välilyönnit, tabulaattorit)" msgid "Whitespaces" msgstr "Tyhjämerkit" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12030,6 +12121,10 @@ msgstr "" msgid "file/foldernames" msgstr "tiedostot/kansionimet" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "kaikki polut" @@ -12267,10 +12362,6 @@ msgstr "%1:een" msgid "to %s" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "viikko" diff --git a/Languages/Tortoise_fr.po b/Languages/Tortoise_fr.po index 719069538..3e8ba5864 100644 --- a/Languages/Tortoise_fr.po +++ b/Languages/Tortoise_fr.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -13,6 +13,7 @@ # Benoît Locher, 2017 # Benoit Neil , 2019,2021 # Christophe SAUVEUR , 2011-2012 +# Clément Forest , 2022 # deathart , 2013-2014 # Dirk Hoffmann , 2015 # a270031086f2a0d3514bc0cb507b48f6, 2019 @@ -44,6 +45,7 @@ # Mathieu Lavigne , 2017-2018 # Mickael Patron , 2012 # bauland , 2014-2016,2018 +# Pascal M , 2021 # peter griffin , 2013 # Philippe , 2012 # Philippe PERIN, 2016 @@ -55,7 +57,7 @@ # peter griffin , 2013 # 4a14a73d523224463300dea5e0502458_3dab472, 2012 # Stéphane Aulery , 2016-2020 -# Sven Strickroth , 2012-2014 +# Sven Strickroth , 2012-2014,2021 # ykatchou , 2012-2013 # d25d9e2161b89af316b61f449106a075_fbd05c9 <8465a6d6bba4183be55c93639397a626_353654>, 2015 # d25d9e2161b89af316b61f449106a075_fbd05c9 <8465a6d6bba4183be55c93639397a626_353654>, 2015 @@ -64,8 +66,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: 2021-03-20 09:31+0000\n" -"Last-Translator: Benoit Neil \n" +"PO-Revision-Date: 2022-01-17 17:17+0000\n" +"Last-Translator: Clément Forest \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" @@ -758,9 +760,10 @@ msgstr "&Police des commentaires :" msgid "&Font:" msgstr "&Police :" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "&Forcer" @@ -1274,6 +1277,10 @@ msgstr "&Écraser" msgid "&Squash ALL" msgstr "&Écraser TOUT" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Départ" @@ -1378,6 +1385,10 @@ msgstr "&Disques inconnus" msgid "&Unlock" msgstr "&Débloquer" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "&Haut" @@ -1433,14 +1444,14 @@ msgstr "Oui" msgid "&add \"cherry picked from\"" msgstr "&ajouter \"cherry picked depuis\"" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "&ignorer les changements d'espaces" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "&Modifications connues" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(TortoiseGit par défaut)" @@ -2953,6 +2964,10 @@ msgstr "Fermer la fenêtre avec demande de confirmation d'enregistrement" msgid "Collapse" msgstr "Replier" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "Replier les révisions" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -3944,15 +3959,15 @@ msgstr "Boîtes de dialogue" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) msgid "Dialogs 1" -msgstr "" +msgstr "Boîtes de dialogue 1" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) msgid "Dialogs 2" -msgstr "" +msgstr "Boîtes de dialogue 2" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) msgid "Dialogs 3" -msgstr "" +msgstr "Boîtes de dialogue 3" #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" @@ -4696,6 +4711,10 @@ msgstr "Exécutable (+x)" msgid "Exit" msgstr "Sortir" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "Déplier les révisions" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Explorer vers" @@ -5213,10 +5232,6 @@ msgstr "Forcer le rebase même si la branche courante est un descendant de la li msgid "Force unlock" msgstr "Forcer le déblocage" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "Forcer: peut annuler" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5299,6 +5314,10 @@ msgstr "Données de validation complètes sans chemins modifiés" msgid "Full data" msgstr "Données complètes" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "Historique complet" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "Recherche plein texte" @@ -5609,6 +5628,14 @@ msgstr "Cacher les menu pour les dossiers non versionnés" msgid "Hide Patch<<" msgstr "Cacher le patch<<" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Masquer le script pendant l'exécution" @@ -6250,6 +6277,13 @@ msgstr "Monnaie Invalide." msgid "Invalid revision number!" msgstr "Numéro de révision invalide!" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "Configuration du traqueur d'incidents" @@ -6303,7 +6337,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "Conserver" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "Conserver les listes de modifications" @@ -6325,7 +6359,7 @@ msgstr "Coréen" msgid "L" msgstr "L" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "LFS" @@ -7527,7 +7561,7 @@ msgstr "Output.prn" #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) msgid "Overlay Handlers" -msgstr "" +msgstr "Gestionnaires de Recouvrement" #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" @@ -7612,6 +7646,16 @@ msgstr "Parent de %2!s!" msgid "Parent(s)" msgstr "parents(s)" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Mot de passe" @@ -8201,7 +8245,7 @@ msgstr "Liste de référence" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1354, Dialog #. IDD_REVGRAPHFILTER: Control id 1729) msgid "RefBrowser" -msgstr "" +msgstr "NavRéférence" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1588, IDS_REFLOG) msgid "RefLog" @@ -8209,7 +8253,7 @@ msgstr "Journal de référence" #. Resource IDs: (IDS_REFBROWSE) msgid "Reference Browser" -msgstr "" +msgstr "Navigateur de références" #. Resource IDs: (Dialog IDD_COMMITISONREFS: Control id 4596) msgid "References commit is on" @@ -8570,7 +8614,8 @@ msgstr "Restaure" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Valeurs par défaut" @@ -8724,11 +8769,6 @@ msgstr "Lancer lorsque le répertoire de travail est sous :" msgid "S" msgstr "S" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "&Afficher les fichiers modifiés dans arborescence de travail!" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "Ignorer les non sélectionnés" @@ -9124,8 +9164,8 @@ msgstr "Sélectionner le tag distant - Tortoisegit" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Sélectionnez le comportement du dialogue de progression en fin d'opération" +"Select the behavior of the progress dialog at the end of the operation." +msgstr "Choisir le comportement de la barre d'avancement à la fin de l'opération" #. Resource IDs: (57642) msgid "" @@ -9161,7 +9201,8 @@ msgstr "Choisissez quel fichier vous voulez sauver sous\nNote: il y a des confli #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "Sélectionner / désélectionner &tout" @@ -9275,7 +9316,7 @@ msgstr "Afficher" #. Resource IDs: (IDS_MENUREFLOG) msgid "Show &RefLog" -msgstr "" +msgstr "Montrer le log des &Références" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1073, #. IDS_PROC_LOG_SHOWUNVERSIONED) @@ -9494,6 +9535,11 @@ msgstr "Voir le journal..." msgid "Show long format even if a tag is exactly on that commit" msgstr "Afficher le format long même si un tag est présent spécifiquement sur cette livraison" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "Montrer les fichiers modifiés dans l'arborescence" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9725,6 +9771,20 @@ msgstr "Graphique en barre empilé" msgid "Stacked Line Graph" msgstr "Graphique en ligne empilé" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Standard" @@ -10685,6 +10745,14 @@ msgstr "À :" msgid "Toggle filters" msgstr "Basculer les filtres" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10780,7 +10848,7 @@ msgid "" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "" +msgstr "TortoiseGitBlame\n\nTortoiseGitBlame\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10804,8 +10872,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseGitIDiff: l'afficheur de différence entre les images pour TortoiseSVN\n\nLes paramètres de ligne de commande disponible sont:\n/left:\"chemin de l'image de gauche\"\n/lefttitle:\"titre à afficher pour l'image de gauche\"\n/right:\"chemin de l'image de droite\"\n/righttitle:\"titre à afficher pour l'image de droite\"\n/overlay\t\tpour activer le mode de superposition\n/fit\t\tpour ajuster la taille des images\n/showinfo\t\tpour afficher la case des infos sur les images" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10902,7 +10970,7 @@ msgstr "découper à droite" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 1853) msgid "Trust the exitcode of the external merge tool for auto resolving" -msgstr "" +msgstr "Faire confiance au code de sortie de l'utilitaire de fusion externe pour la résolution automatique" #. Resource IDs: (IDS_SVNERR_CLEANUPORFRESHCHECKOUT) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." @@ -11002,6 +11070,11 @@ msgstr "Impossible d'écrire dans %1, il est en lecture seule ou ouvert par quel msgid "Uncheck" msgstr "Annuler sélection" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11075,6 +11148,16 @@ msgstr "Conflits non résolus!" msgid "Unset tracked branch" msgstr "Désélectionner la branche suivie" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Sans nom" @@ -11129,30 +11212,10 @@ msgstr "Utiliser la vue panneau unique par défaut p&our les diff de 2 fichiers" msgid "Use &other text block" msgstr "Utiliser l'autre bl&oc de texte" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Utiliser le bloc de texte 'le mien'" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Utiliser le bloc de texte 'le mien' puis 'le leur'" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Utiliser le bloc de texte 'le leur'" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Utiliser le bloc de texte 'le leur' puis 'le mien'" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "Utiliser .mailmap" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "Utiliser un chemin de composante HTTP" @@ -11238,11 +11301,13 @@ msgstr "Utiliser le bloc de gauche" msgid "Use left file" msgstr "Utiliser le fichier gauche" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "Utiliser le bloc de gauche" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "Utiliser le bloc de texte de gauche puis celui de droite" @@ -11262,11 +11327,12 @@ msgstr "Utiliser les expressions régulières" msgid "Use right block" msgstr "Utiliser le bloc de droite" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "Utiliser le bloc de droite" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "Utiliser le bloc de texte de droite puis celui de gauche" @@ -11487,10 +11553,19 @@ msgstr "Voir .tgitconfig" msgid "View Bars" msgstr "Voir les Barres" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "Afficher un patch" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11536,8 +11611,8 @@ msgid "Waiting for input" msgstr "En attente d'une saisie" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" -msgstr "Comportement de parcours" +msgid "Walk Be&havior" +msgstr "Comportement du parcours &h" #. Resource IDs: (IDS_WARN_WARNING) msgid "Warning" @@ -11623,6 +11698,20 @@ msgstr "Quand l'URL est saisie, le nom distant est automatiquement rempli par \" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "Référencer seulement les tags annotés, tous les tags, ou toutes les refs" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11649,6 +11738,10 @@ msgstr "Changements des caractères d'espacement (tabulation, espaces)" msgid "Whitespaces" msgstr "Espacements" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -11738,7 +11831,7 @@ msgstr "Vous avez demandé un tirage, mais n'avez pas spécifié de branche dist #. Resource IDs: (IDS_PRUNE_OPTION_GUIDE) msgid "" "You can configure it for all remotes or global on the Git settings page." -msgstr "" +msgstr "Vous pouvez le configurer pour tous les référentiels distants ou sur la page de réglages globaux de Git. " #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535) msgid "" @@ -12078,6 +12171,10 @@ msgstr "fichier, pas un sous-module" msgid "file/foldernames" msgstr "fichiers/noms de répertoire" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "chemin complet" @@ -12159,15 +12256,15 @@ msgstr "Gestion - Seulement le dépôt" #. Resource IDs: (IDS_SYSTEM_GCMCORE) msgid "manager-core - all Windows users" -msgstr "" +msgstr "manager-core - pour tous les utilisateurs de windows" #. Resource IDs: (IDS_GLOBAL_GCMCORE) msgid "manager-core - current Windows user" -msgstr "" +msgstr "manager-core - pour l'utilisateur actuel de windows" #. Resource IDs: (IDS_LOCAL_GCMCORE) msgid "manager-core - this repository only" -msgstr "" +msgstr "manager-core - pour ce dépôt seulement" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1494) msgid "master" @@ -12315,10 +12412,6 @@ msgstr "vers %1" msgid "to %s" msgstr "vers %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "Changements i&nconnus" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "semaine" diff --git a/Languages/Tortoise_he.po b/Languages/Tortoise_he.po index 19cb13bd7..20406382a 100644 --- a/Languages/Tortoise_he.po +++ b/Languages/Tortoise_he.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -11,8 +11,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: 2021-03-07 09:25+0000\n" -"Last-Translator: Asaf Gamliel \n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" +"Last-Translator: Sven Strickroth \n" "Language-Team: Hebrew (http://www.transifex.com/lznuaa/tortoisegit/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -705,9 +705,10 @@ msgstr "" msgid "&Font:" msgstr "&גופן:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "&אלץ" @@ -1221,6 +1222,10 @@ msgstr "" msgid "&Squash ALL" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&התחל" @@ -1325,6 +1330,10 @@ msgstr "" msgid "&Unlock" msgstr "&בטל נעילה" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "&למעלה" @@ -1380,12 +1389,12 @@ msgstr "&כן" msgid "&add \"cherry picked from\"" msgstr "" -#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) -msgid "&ignore space change" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" +#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) +msgid "&ignore space change" msgstr "" #. Resource IDs: (IDS_TORTOISEGITDEFAULT) @@ -2900,6 +2909,10 @@ msgstr "" msgid "Collapse" msgstr "" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4643,6 +4656,10 @@ msgstr "" msgid "Exit" msgstr "יציאה" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "" @@ -5160,10 +5177,6 @@ msgstr "" msgid "Force unlock" msgstr "אלץ ביטול נעילה" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5246,6 +5259,10 @@ msgstr "" msgid "Full data" msgstr "נתונים מלאים" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "חיפוש טקסט מלא" @@ -5556,6 +5573,14 @@ msgstr "" msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "" @@ -6197,6 +6222,13 @@ msgstr "" msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6250,7 +6282,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "שמור" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "" @@ -6272,7 +6304,7 @@ msgstr "Korean" msgid "L" msgstr "L" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7559,6 +7591,16 @@ msgstr "" msgid "Parent(s)" msgstr "" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "סיסמה" @@ -8087,7 +8129,7 @@ msgstr "" #. Resource IDs: (ID_FILE_MRU_FILE1 - Menu) msgid "Recent File" -msgstr "" +msgstr "קובץ אחרון" #. Resource IDs: (Dialog IDD_SETTINGSTBLAME: Control id 65535) msgid "Recently modified lines" @@ -8121,7 +8163,7 @@ msgstr "" #. Resource IDs: (cmdRedo_LabelTitle_RESID) msgid "Redo" -msgstr "" +msgstr "בצע מחדש" #. Resource IDs: (57644, cmdRedo) msgid "" @@ -8186,7 +8228,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_REGEXFILTER: Control id 65535) msgid "Regex:" -msgstr "" +msgstr "ביטוי רגולרי:" #. Resource IDs: (IDS_LOG_FILTER_REGEX_TT) msgid "" @@ -8237,16 +8279,16 @@ msgstr "" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1573, Dialog #. IDD_SETTINREMOTE: Control id 4570) msgid "Remote" -msgstr "" +msgstr "מאגר מרוחק" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 65535, Dialog #. IDD_SELECTREMOTEREF: Control id 65535) msgid "Remote &Branch:" -msgstr "" +msgstr "&ענף במאגר מרוחק" #. Resource IDs: (Dialog IDD_SYNC: Control id 1618) msgid "Remote &URL:" -msgstr "" +msgstr "&URL של מאגר מרוחק" #. Resource IDs: (Dialog IDD_SUBMODULE_UPDATE: Control id 1754) msgid "Remote &tracking branch" @@ -8255,7 +8297,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 65535, #. IDS_PROC_REMOTEBRANCH) msgid "Remote Branch" -msgstr "" +msgstr "ענף מרוחק" #. Resource IDs: (IDS_TAGCOMPARE_REMOTEHASH) msgid "Remote SHA1" @@ -8455,7 +8497,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1561, Dialog IDD_RESET: #. Control id 317, IDS_PROC_RESET, IDS_PROGRS_TITLE_RESET) msgid "Reset" -msgstr "" +msgstr "אתחול" #. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1554, Dialog IDD_RESET: #. Control id 1554) @@ -8468,12 +8510,12 @@ msgstr "" #. Resource IDs: (IDS_STATUSLIST_RESETCOLUMNORDER) msgid "Reset columns" -msgstr "" +msgstr "אתחל עמודות" #. Resource IDs: (IDS_PROC_RESETBRANCH) #, c-format msgid "Reset current branch \"%s\" to" -msgstr "" +msgstr "אתחל ענף נוכחי \"%s\" ל" #. Resource IDs: (Dialog IDD_RESOLVE: Control id 207, IDS_PROGRS_CMD_RESOLVE, #. IDS_PROGRS_TITLE_RESOLVE) @@ -8517,7 +8559,8 @@ msgstr "" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "" @@ -8671,11 +8714,6 @@ msgstr "" msgid "S" msgstr "S" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9071,7 +9109,7 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." +"Select the behavior of the progress dialog at the end of the operation." msgstr "" #. Resource IDs: (57642) @@ -9108,7 +9146,8 @@ msgstr "" #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "" @@ -9441,6 +9480,11 @@ msgstr "" msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9672,6 +9716,20 @@ msgstr "" msgid "Stacked Line Graph" msgstr "" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "" @@ -10632,6 +10690,14 @@ msgstr "עד:" msgid "Toggle filters" msgstr "" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10751,8 +10817,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10949,6 +11015,11 @@ msgstr "" msgid "Uncheck" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11022,6 +11093,16 @@ msgstr "" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "" @@ -11076,30 +11157,10 @@ msgstr "" msgid "Use &other text block" msgstr "" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11185,11 +11246,13 @@ msgstr "" msgid "Use left file" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11209,11 +11272,12 @@ msgstr "" msgid "Use right block" msgstr "השתמש בבלוק הימני" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "השתמש בבלוק הטקסט הימני" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "השתמש בבלוק הטקסט הימני ואז בשמאלי" @@ -11434,10 +11498,19 @@ msgstr "" msgid "View Bars" msgstr "" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11483,7 +11556,7 @@ msgid "Waiting for input" msgstr "" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11570,6 +11643,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11596,6 +11683,10 @@ msgstr "" msgid "Whitespaces" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12025,6 +12116,10 @@ msgstr "" msgid "file/foldernames" msgstr "" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "" @@ -12262,10 +12357,6 @@ msgstr "אל %1" msgid "to %s" msgstr "אל %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "שבוע" diff --git a/Languages/Tortoise_hu.po b/Languages/Tortoise_hu.po index e6fa3db4e..494fa4deb 100644 --- a/Languages/Tortoise_hu.po +++ b/Languages/Tortoise_hu.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Hungarian (http://www.transifex.com/lznuaa/tortoisegit/language/hu/)\n" "MIME-Version: 1.0\n" @@ -717,9 +717,10 @@ msgstr "&Megjegyzések betűtípusa:" msgid "&Font:" msgstr "&Betűtípus:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "" @@ -1233,6 +1234,10 @@ msgstr "" msgid "&Squash ALL" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Indítás" @@ -1337,6 +1342,10 @@ msgstr "&Ismeretlen meghajtók" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "&Fel" @@ -1392,12 +1401,12 @@ msgstr "&Igen" msgid "&add \"cherry picked from\"" msgstr "" -#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) -msgid "&ignore space change" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" +#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) +msgid "&ignore space change" msgstr "" #. Resource IDs: (IDS_TORTOISEGITDEFAULT) @@ -2912,6 +2921,10 @@ msgstr "Bezárja az aktív ablakot és megkérdezi, hogy elmentse-e a dokumentum msgid "Collapse" msgstr "Összecsukás" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4655,6 +4668,10 @@ msgstr "" msgid "Exit" msgstr "Kilépés" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Mappa megnyitása" @@ -5172,10 +5189,6 @@ msgstr "" msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5258,6 +5271,10 @@ msgstr "" msgid "Full data" msgstr "" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "" @@ -5568,6 +5585,14 @@ msgstr "Menü elrejtése a nem verziókezelt útvonalaknál" msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Szkript elrejtése futás közben" @@ -6209,6 +6234,13 @@ msgstr "Rossz pénznem." msgid "Invalid revision number!" msgstr "Érvénytelen verziószám!" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6262,7 +6294,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "Megtartás" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "Változáslisták megtartása" @@ -6284,7 +6316,7 @@ msgstr "" msgid "L" msgstr "" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7571,6 +7603,16 @@ msgstr "" msgid "Parent(s)" msgstr "" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "" @@ -8529,7 +8571,8 @@ msgstr "" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Alapértelmezett" @@ -8683,11 +8726,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9083,8 +9121,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Mit tegyen a folyamatjelző ablak a feladat végén" +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9120,7 +9158,8 @@ msgstr "" #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "" @@ -9453,6 +9492,11 @@ msgstr "Napló megtekintése..." msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9684,6 +9728,20 @@ msgstr "Halmozott oszlopdiagram" msgid "Stacked Line Graph" msgstr "Halmozott vonaldiagram" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Alap" @@ -10644,6 +10702,14 @@ msgstr "Eddig:" msgid "Toggle filters" msgstr "" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10763,8 +10829,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseGitIDiff: a TortoiseSVN különbség-megjelenítője képek számára\n\nA használható paraméterek:\n/left: \"a bal oldali kép útvonala\"\n/lefttitle: \"a bal oldali kép címe (a címsorban)\"\n/right: \"a jobb oldali kép útvonala\"\n/righttitle: \"a jobb oldali kép címe (a címsorban)\"\n/overlay Átfedés engedélyezése\n/fit Képek méreteinek egyeztetése\n/showinfo Információ megjelenítése a képekről" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10961,6 +11027,11 @@ msgstr "Nem írható a %1 fájl, már már megnyitotta vagy írásvédett." msgid "Uncheck" msgstr "Kijelölést megszüntet" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11034,6 +11105,16 @@ msgstr "" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Névtelen" @@ -11088,30 +11169,10 @@ msgstr "&Egypaneles nézet az alapértelmezett" msgid "Use &other text block" msgstr "Másik &szövegblokk használata" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "'Saját' szövegblokk használata" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "A 'Saját' majd a 'Másik' szövegblokk használata" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "'Másik' szövegblokk használata" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "A 'Másik' majd a 'Saját' szövegblokk használata" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11197,11 +11258,13 @@ msgstr "Bal oldali blokk használata" msgid "Use left file" msgstr "Bal oldali fájl használata" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11221,11 +11284,12 @@ msgstr "Regex használata" msgid "Use right block" msgstr "Jobb oldali blokk használata" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11446,10 +11510,19 @@ msgstr "" msgid "View Bars" msgstr "" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11495,7 +11568,7 @@ msgid "Waiting for input" msgstr "" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11582,6 +11655,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11608,6 +11695,10 @@ msgstr "" msgid "Whitespaces" msgstr "Láthatatlan karakterek" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12037,6 +12128,10 @@ msgstr "" msgid "file/foldernames" msgstr "fájl-/könyvtárnevek" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "teljes útvonalak" @@ -12274,10 +12369,6 @@ msgstr "%1-hez" msgid "to %s" msgstr "%s-be" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "hét" diff --git a/Languages/Tortoise_id.po b/Languages/Tortoise_id.po index 25dc8e7af..52b881a99 100644 --- a/Languages/Tortoise_id.po +++ b/Languages/Tortoise_id.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Indonesian (http://www.transifex.com/lznuaa/tortoisegit/language/id/)\n" "MIME-Version: 1.0\n" @@ -717,9 +717,10 @@ msgstr "&Font untuk pesan log:" msgid "&Font:" msgstr "&Font:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "" @@ -1233,6 +1234,10 @@ msgstr "" msgid "&Squash ALL" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "" @@ -1337,6 +1342,10 @@ msgstr "&Drive tak dikenal" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "" @@ -1392,12 +1401,12 @@ msgstr "" msgid "&add \"cherry picked from\"" msgstr "" -#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) -msgid "&ignore space change" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" +#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) +msgid "&ignore space change" msgstr "" #. Resource IDs: (IDS_TORTOISEGITDEFAULT) @@ -2912,6 +2921,10 @@ msgstr "Tutup jendela aktif dan tanya untuk menyimpan dokumen" msgid "Collapse" msgstr "" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4655,6 +4668,10 @@ msgstr "" msgid "Exit" msgstr "Keluar" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Eksplorasi ke" @@ -5172,10 +5189,6 @@ msgstr "" msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5258,6 +5271,10 @@ msgstr "" msgid "Full data" msgstr "" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "" @@ -5568,6 +5585,14 @@ msgstr "Sembunyikan Menu untuk path-path yang tidak berversi" msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Sembunyikan naskah saat dijalankan" @@ -6209,6 +6234,13 @@ msgstr "Mata Uang tidak Sahih." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6262,7 +6294,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "" @@ -6284,7 +6316,7 @@ msgstr "" msgid "L" msgstr "" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7571,6 +7603,16 @@ msgstr "" msgid "Parent(s)" msgstr "" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "" @@ -8529,7 +8571,8 @@ msgstr "" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Kembalikan Standar" @@ -8683,11 +8726,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9083,8 +9121,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Pilih tindak-tanduk dari dialog progres di akhir operasi." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9120,7 +9158,8 @@ msgstr "" #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "" @@ -9453,6 +9492,11 @@ msgstr "" msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9684,6 +9728,20 @@ msgstr "Grafik Stacked Bar" msgid "Stacked Line Graph" msgstr "Grafik Stacked Garis" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Standar" @@ -10644,6 +10702,14 @@ msgstr "Ke:" msgid "Toggle filters" msgstr "" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10763,8 +10829,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10961,6 +11027,11 @@ msgstr "Tidak bisa menulis ke %1, ia hanya-baca atau dibuka oleh orang lain." msgid "Uncheck" msgstr "Tidak dicentang" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11034,6 +11105,16 @@ msgstr "Konflik tak terselesaikan!" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Tanpa judul" @@ -11088,30 +11169,10 @@ msgstr "Gunakan tampilan sat&u-jendela sebagai standar untuk diff 2-berkas" msgid "Use &other text block" msgstr "Gunakan bl&ok teks lain" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11197,11 +11258,13 @@ msgstr "" msgid "Use left file" msgstr "Gunakan berkas kiri" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11221,11 +11284,12 @@ msgstr "Gunakan ekspresi reguler" msgid "Use right block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11446,10 +11510,19 @@ msgstr "" msgid "View Bars" msgstr "" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11495,7 +11568,7 @@ msgid "Waiting for input" msgstr "" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11582,6 +11655,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11608,6 +11695,10 @@ msgstr "" msgid "Whitespaces" msgstr "Spasi putih" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12037,6 +12128,10 @@ msgstr "" msgid "file/foldernames" msgstr "" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "" @@ -12274,10 +12369,6 @@ msgstr "ke %1" msgid "to %s" msgstr "ke %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "minggu" diff --git a/Languages/Tortoise_it.po b/Languages/Tortoise_it.po index 6ccfe7625..b4751793b 100644 --- a/Languages/Tortoise_it.po +++ b/Languages/Tortoise_it.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -14,7 +14,7 @@ # Emilio Bologna <>, 2012 # Fabio Turrin, 2018 # Giulio Franco , 2018 -# Giuseppe Bogetti , 2016 +# Giuseppe Bogetti , 2016,2021 # Lübbe , 2012 # Lübbe Onken , 2011 # Lübbe Onken , 2011 @@ -24,20 +24,20 @@ # 43e8222b3be8174d9b39e58a02616ea6_2d981e6 , 2015 # Paolo Crocetti , 2017 # Roberto Casazza , 2011 -# Rossano Praderi , 2015 -# Rossano Praderi , 2015 +# Rossano Praderi , 2015 +# Rossano Praderi , 2015 # Silvia, 2013 # Simone Mazzotti , 2016 # Simone Mazzotti , 2016 # skynet_italy , 2020 -# Sven Strickroth , 2016,2018,2020 +# Sven Strickroth , 2016,2018,2020-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: 2021-03-21 00:15+0000\n" -"Last-Translator: Alessio Cuccovillo \n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" +"Last-Translator: Sven Strickroth \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" @@ -730,9 +730,10 @@ msgstr "&Font per commenti:" msgid "&Font:" msgstr "&Font:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "&Forza" @@ -1246,6 +1247,10 @@ msgstr "&Integra commento" msgid "&Squash ALL" msgstr "&Squash TUTTI" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Inizio" @@ -1350,6 +1355,10 @@ msgstr "&Unità sconosciute" msgid "&Unlock" msgstr "&Sblocca" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "&Su" @@ -1405,14 +1414,14 @@ msgstr "&Sì" msgid "&add \"cherry picked from\"" msgstr "&aggiungi \"cherry scelto da\"" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "&ignora cambiamento di spaziatura" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "&cambiamenti conosciuti" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(TortoiseGit default)" @@ -1993,7 +2002,7 @@ msgstr "&URL:" #. Resource IDs: (IDS_CONFIRMRESETCOLUMNORDER) msgid "Are you sure to reset columns?" -msgstr "" +msgstr "Sei sicuro di voler ripristinare le colonne ?" #. Resource IDs: (IDS_PROC_REBASE_ABORT) msgid "Are you sure you want to abort the rebase process?" @@ -2017,7 +2026,7 @@ msgstr "Vuoi davvero ripristinare %d elemento/i? Perderai TUTTE le modifiche a p #. Resource IDs: (IDS_WARNUSERSAFEDIFFERENT) #, c-format msgid "Are you sure you want to save to \"%s\"?" -msgstr "" +msgstr "Sei sicuro di voler salvare in \"%s\"?" #. Resource IDs: (ID_VIEW_ARRANGEVERTICAL - Menu) msgid "Arrange &vertical\tV" @@ -2049,12 +2058,12 @@ msgstr "Assumi come valido/non modificato (\"Richiede-lock\" in TortoiseSVN)" #. (ID_VIEW_DETECT_MOVED_OR_COPIED_LINES_FROM_EXISTING_FILES_AT_FILE_CREATION #. - Menu) msgid "At file &creation" -msgstr "" +msgstr "Alla &creazione del file" #. Resource IDs: #. (IDS_DETECT_MOVED_OR_COPIED_LINES_FROM_EXISTING_FILES_AT_FILE_CREATION) msgid "At file creation" -msgstr "" +msgstr "Alla creazione del file" #. Resource IDs: (IDS_PROGRS_ATREV) #, c-format @@ -2139,7 +2148,7 @@ msgstr "Conversione automatica 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" @@ -2165,7 +2174,7 @@ msgstr "L'autocompletamento suggerisce parole (di solito classi o nomi di membri #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) msgid "AutoCrLf:" -msgstr "" +msgstr "AutoCrLf:" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" @@ -2925,6 +2934,10 @@ msgstr "Chiudi la finestra con richiesta di salvataggio" msgid "Collapse" msgstr "Minimizza" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -2943,15 +2956,15 @@ msgstr "Colori" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) msgid "Colors 1" -msgstr "" +msgstr "Colori 1" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) msgid "Colors 2" -msgstr "" +msgstr "Colori 2" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) msgid "Colors 3" -msgstr "" +msgstr "Colori 3" #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format @@ -3231,11 +3244,11 @@ msgstr "Conflitti: %d" #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) msgid "Context Menu" -msgstr "" +msgstr "Menu Contestuale" #. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) msgid "Context Menu 2" -msgstr "" +msgstr "Menu Contestuale 2" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" @@ -3362,7 +3375,7 @@ msgid "" "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 "" +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\"." #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) #, c-format @@ -3602,7 +3615,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 65535) msgid "Credential helper:" -msgstr "" +msgstr "Aiuto credenziali" #. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 65535) msgid "Credentials" @@ -3916,15 +3929,15 @@ msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) msgid "Dialogs 1" -msgstr "" +msgstr "Finestre di dialogo 1" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) msgid "Dialogs 2" -msgstr "" +msgstr "Finestre di dialogo 2" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) msgid "Dialogs 3" -msgstr "" +msgstr "Finestre di dialogo 3" #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" @@ -4441,7 +4454,7 @@ msgstr "" #. Resource IDs: (IDS_LOG_FILTER_EMAILS) msgid "Emails" -msgstr "" +msgstr "Emails" #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535) msgid "Empty" @@ -4668,6 +4681,10 @@ msgstr "" msgid "Exit" msgstr "Esci" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Apri percorso file" @@ -5059,7 +5076,7 @@ msgstr "Trova il testo specificato\nTrova" #. Resource IDs: (Dialog IDD_FINDBAR: Control id 65535) msgid "Find:" -msgstr "" +msgstr "Trova:" #. Resource IDs: (IDS_FIND_NOTFOUND) #, c-format @@ -5185,10 +5202,6 @@ msgstr "Forzare il rebase anche se il ramo corrente è discendente del commit su msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5207,14 +5220,14 @@ msgstr "" msgid "" "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 "" +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\"." #. 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 running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." -msgstr "" +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." #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) msgid "" @@ -5271,6 +5284,10 @@ msgstr "" msgid "Full data" msgstr "Dati completi" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "" @@ -5581,6 +5598,14 @@ msgstr "Nascondi menu per percorsi senza versione" msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Nascondi lo script mentre è attivo" @@ -6222,13 +6247,20 @@ msgstr "Valuta non valida." msgid "Invalid revision number!" msgstr "Numero di revisione non valido!" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +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 "" +msgstr "Integrazione Issue Tracker" #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" @@ -6275,7 +6307,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "Mantieni" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "Mantieni lista modifiche" @@ -6297,7 +6329,7 @@ msgstr "Coreano" msgid "L" msgstr "L" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "LFS" @@ -7584,6 +7616,16 @@ msgstr "" msgid "Parent(s)" msgstr "" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Password" @@ -7712,7 +7754,7 @@ msgstr "" msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" -msgstr "" +msgstr "Immagini (*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Tutte (*.*)|*.*||" #. Resource IDs: (IDS_STATGRAPH_PIEBUTTON_TT) msgid "Pie Graph" @@ -8040,7 +8082,7 @@ msgstr "R&ipristina fino a questa revisione" #. Resource IDs: (IDS_LOG_REBASE) msgid "REBASE" -msgstr "" +msgstr "REBASE" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1769) msgid "Randomize Sync Dialog startup position" @@ -8542,7 +8584,8 @@ msgstr "Ripristina" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Ripristina predefiniti" @@ -8696,11 +8739,6 @@ msgstr "" msgid "S" msgstr "S" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -8784,7 +8822,7 @@ msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) msgid "SafeCrLf:" -msgstr "" +msgstr "SafeCrLf:" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9096,8 +9134,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Selezionare come si vuole che si comporti la finestra di avanzamento al termine dell'operazione." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9133,7 +9171,8 @@ msgstr "Seleziona quale file vuoi salvare come\nNota: E' presente un conflitto n #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "Seleziona / deseleziona &tutti" @@ -9466,6 +9505,11 @@ msgstr "Visualizza registro attività..." msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9697,6 +9741,20 @@ msgstr "Barre in pila" msgid "Stacked Line Graph" msgstr "Linee in pila" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Standard" @@ -10657,6 +10715,14 @@ msgstr "A:" msgid "Toggle filters" msgstr "" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10752,7 +10818,7 @@ msgid "" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "" +msgstr "TortoiseGitBlame\n\nTortoiseGitBlame\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10776,8 +10842,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseGitIDiff: confronto di immagini per TortoiseGit\n\nI parametri disponibili nella la linea di comando sono:\n/left:\"percorso dell'immagine di sinistra\"\n/lefttitle:\"titolo da mostrare per l'immagine di sinistra\"\n/right:\"percorso dell'immagine di destra\"\n/righttitle:\"titolo da mostrare per l'immagine di destra\"\n/overlay\t\tabilitare modalità sovrapposizione\n/fit\t\tper adattare le dimensioni delle immagini\n/showinfo\t\tper mostrare le informazioni sulle immagini" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10974,6 +11040,11 @@ msgstr "Impossibile scrivere in %1, il file è di sola lettura o aperto da qualc msgid "Uncheck" msgstr "Deseleziona" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11047,6 +11118,16 @@ msgstr "Conflitto non risolto!" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Senza titolo" @@ -11101,30 +11182,10 @@ msgstr "Usa la vista ad &un solo pannello come predefinita per il confronto tra msgid "Use &other text block" msgstr "Usa un'altr&o blocco di testo" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Usa i 'miei' blocchi di testo" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Usa i 'miei' blocchi di testo al posto dei 'suoi'" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Usa 'i suoi' blocchi di testo" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Usa i 'suoi' blocchi di testo al posto dei 'miei'" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11210,11 +11271,13 @@ msgstr "Usa blocchi a sinistra" msgid "Use left file" msgstr "Utilizza il file di sinistra" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11234,11 +11297,12 @@ msgstr "Usa espressione regolare" msgid "Use right block" msgstr "Usa il blocco destro" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11459,10 +11523,19 @@ msgstr "Visualizza .tgitconfig" msgid "View Bars" msgstr "Visualizza barre" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "View Patch" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11508,7 +11581,7 @@ msgid "Waiting for input" msgstr "In attesa di input" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11595,6 +11668,20 @@ msgstr "Quando si digita l'URL, il nome remoto sarà automaticamente riempito co msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "Se fare riferimento solo ai tag annotati, a tutti i tag o a tutti i riferimenti" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11621,6 +11708,10 @@ msgstr "Differenze di spazi (tabs, spazi)" msgid "Whitespaces" msgstr "Spaziature" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12050,6 +12141,10 @@ msgstr "" msgid "file/foldernames" msgstr "Nomi di file/cartelle" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "Percorsi completi" @@ -12131,15 +12226,15 @@ msgstr "manager - solo questo repository" #. Resource IDs: (IDS_SYSTEM_GCMCORE) msgid "manager-core - all Windows users" -msgstr "" +msgstr "manager-core - tutti gli utenti Windows" #. Resource IDs: (IDS_GLOBAL_GCMCORE) msgid "manager-core - current Windows user" -msgstr "" +msgstr "manager-core - corrente utente Windows" #. Resource IDs: (IDS_LOCAL_GCMCORE) msgid "manager-core - this repository only" -msgstr "" +msgstr "manager-core - solo questo repository" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1494) msgid "master" @@ -12192,7 +12287,7 @@ msgstr "senza versione" #. Resource IDs: (IDS_ENCRYPT_NONE) msgid "none" -msgstr "" +msgstr "nessuno" #. Resource IDs: (IDS_STATUSNORMAL) msgid "normal" @@ -12287,10 +12382,6 @@ msgstr "a %1" msgid "to %s" msgstr "in %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "settimana" diff --git a/Languages/Tortoise_ja.po b/Languages/Tortoise_ja.po index 7b543229f..02c6786dc 100644 --- a/Languages/Tortoise_ja.po +++ b/Languages/Tortoise_ja.po @@ -1,11 +1,11 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # # Translators: # ABE Tsunehiko, 2015 -# carrotsoft , 2012 +# b8b89a28076decde757efbd7cbc96056_a4e3beb, 2012 # Diego Búrigo Zacarão , 2011 # FIRST AUTHOR , 2008 # fshin, 2019 @@ -16,7 +16,7 @@ # Joseph Ting , 2017 # Koto <>, 2012 # Lübbe , 2012 -# 藤本理弘 , 2015 +# Masahiro FUJIMOTO , 2015 # Nozomu Kaneko , 2013 # Osamu NAKAMURA, 2013 # Ratnadeep Debnath , 2012 @@ -34,19 +34,19 @@ # Tetsuya Morimoto , 2011 # YANO Tetsu , 2012-2013 # YANO Tetsu , 2013 -# YANO Tetsu , 2013-2015 +# YANO Tetsu , 2013-2015,2021 # hirose y , 2012 # Yoshitaka Yamashita , 2013 # youten, 2011 # Tsuyoshi Okawa , 2016 -# 藤本理弘 , 2013,2015,2017,2019-2021 +# Masahiro FUJIMOTO , 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: 2021-03-14 03:31+0000\n" -"Last-Translator: 藤本理弘 \n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" +"Last-Translator: Sven Strickroth \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" @@ -739,9 +739,10 @@ msgstr "ログメッセージのフォント(&F):" msgid "&Font:" msgstr "フォント(&F):" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "強制(&F)" @@ -1255,6 +1256,10 @@ msgstr "融合(&S)" msgid "&Squash ALL" msgstr "すべて融合(&S)" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "開始(&S)" @@ -1359,6 +1364,10 @@ msgstr "その他/判定に失敗(&U)" msgid "&Unlock" msgstr "ロック解除(&U)" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "上へ(&U)" @@ -1414,14 +1423,14 @@ msgstr "はい(&Y)" msgid "&add \"cherry picked from\"" msgstr "\"cherry picked from\" を追加(&A)" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "空白の変更を無視(&I)" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "把握している変更(&K)" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(TortoiseGit のデフォルト)" @@ -2934,6 +2943,10 @@ msgstr "ドキュメントを保存するために、アクティブなウィン msgid "Collapse" msgstr "折りたたむ" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4677,6 +4690,10 @@ msgstr "実行可能 (+x)" msgid "Exit" msgstr "終了" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "エクスプローラーで開く" @@ -5194,10 +5211,6 @@ msgstr "現在のブランチが、接続しようとしているコミットの msgid "Force unlock" msgstr "強制ロック解除" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "強制: 以下を失う可能性がある" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5280,6 +5293,10 @@ msgstr "変更されたパスを除く全てのコミットデータ" msgid "Full data" msgstr "全データ" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "全文検索" @@ -5590,6 +5607,14 @@ msgstr "バージョン管理外のパスではメニューを表示しない" msgid "Hide Patch<<" msgstr "パッチを隠す<<" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "実行時はスクリプトを非表示にする" @@ -6231,6 +6256,13 @@ msgstr "無効な通貨です。" msgid "Invalid revision number!" msgstr "不正なリビジョン番号！" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "課題追跡システムの設定" @@ -6284,7 +6316,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "維持" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "変更リストを保持する" @@ -6306,7 +6338,7 @@ msgstr "朝鮮語" msgid "L" msgstr "L" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "LFS" @@ -7593,6 +7625,16 @@ msgstr "%2!s! の親" msgid "Parent(s)" msgstr "親" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "パスワード" @@ -8551,7 +8593,8 @@ msgstr "復元" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "デフォルトを復元" @@ -8705,11 +8748,6 @@ msgstr "作業ツリーが以下のパスの下にあるときに実行:" msgid "S" msgstr "S" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "作業ツリーにおいて変更されたファイルを表示(&H)" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "非選択をスキップ(&K)" @@ -9105,7 +9143,7 @@ msgstr "リモートのrefを選択" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." +"Select the behavior of the progress dialog at the end of the operation." msgstr "処理終了時の進行状況ダイアログの動作を選択します。" #. Resource IDs: (57642) @@ -9142,7 +9180,8 @@ msgstr "どのファイルを名前を付けて保存するか選択してくだ #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "すべてを選択/解除(&A)" @@ -9475,6 +9514,11 @@ msgstr "ログを表示..." msgid "Show long format even if a tag is exactly on that commit" msgstr "該当コミットにタグがあっても、長いフォーマットで表示する" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "作業ツリーにおいて変更されたファイルを表示(&W)" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9706,6 +9750,20 @@ msgstr "積み重ね棒グラフ" msgid "Stacked Line Graph" msgstr "積み重ね面グラフ" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "標準" @@ -10666,6 +10724,14 @@ msgstr "To:" msgid "Toggle filters" msgstr "フィルターを反転" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10785,8 +10851,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseGitIDiff: TortoiseSVNの画像差分ビューア\n\n利用可能なコマンドラインパラメーター:\n/left:\"左の画像のパス\"\n/lefttitle:\"左の画像のタイトル\"\n/right:\"右の画像のパス\"\n/righttitle:\"右の画像のタイトル\"\n/overlay\t\tオーバーレイモードを有効\n/fit\t\tイメージサイズに合わせる\n/showinfo\t\t画像の情報ボックスを表示" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10983,6 +11049,11 @@ msgstr "%1 に書き込めません。読み取り専用か、他の誰かが開 msgid "Uncheck" msgstr "未チェック" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11056,6 +11127,16 @@ msgstr "未解決の競合!" msgid "Unset tracked branch" msgstr "ブランチを追跡しない" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "未タイトル" @@ -11110,30 +11191,10 @@ msgstr "2つのファイルの差分に、デフォルトで1画面表示を使 msgid "Use &other text block" msgstr "他のテキストブロックを使用(&O)" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "「こちら側」のテキストブロックを使う" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "「こちら側」のテキストブロックを使用してから、「あちら側」を使用" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "「あちら側」のテキストブロックを使用" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "「あちら側」のテキストブロックを使用してから、「こちら側」を使用" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr ".mailmap を使用" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "HTTP path を要素として利用" @@ -11219,11 +11280,13 @@ msgstr "左ブロックを使用" msgid "Use left file" msgstr "左のファイルを使用" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "左のテキストブロックを使用" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "左→右の順でテキストブロックを使用" @@ -11243,11 +11306,12 @@ msgstr "正規表現を使用する" msgid "Use right block" msgstr "右ブロックを使用" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "右のテキストブロックを使用" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "右→左の順でテキストブロックを使用" @@ -11468,10 +11532,19 @@ msgstr " .tgitconfigを表示" msgid "View Bars" msgstr "バーを表示" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "パッチを表示" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11517,7 +11590,7 @@ msgid "Waiting for input" msgstr "入力待ち" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "ツリーの探索(&H)" #. Resource IDs: (IDS_WARN_WARNING) @@ -11604,6 +11677,20 @@ msgstr "URLを入力すると、リモート名が空ならば自動的に \"ori msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "「注釈付きタグ (annotated tag)」「すべてのタグ」「すべてのRef」のどれを参照するか指定します。" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11630,6 +11717,10 @@ msgstr "ホワイトスペースの変更(タブ,スペース)" msgid "Whitespaces" msgstr "ホワイトスペース" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12059,6 +12150,10 @@ msgstr "サブモジュールでないファイル" msgid "file/foldernames" msgstr "ファイル/フォルダ名" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "フルパス" @@ -12296,10 +12391,6 @@ msgstr "to %1" msgid "to %s" msgstr "%s へ" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "把握外の変更(&N)" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "週" diff --git a/Languages/Tortoise_ko.po b/Languages/Tortoise_ko.po index d188a58b2..020da1598 100644 --- a/Languages/Tortoise_ko.po +++ b/Languages/Tortoise_ko.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -8,7 +8,7 @@ # Gyusun Yeom , 2012 # Hyuk Jae Choi , 2016 # Ian Yoon , 2012 -# jeiea , 2013 +# Hoj Gim , 2013 # Jinbaek Lee , 2016 # Juhee Park , 2020 # 오준일 , 2018 @@ -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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Korean (http://www.transifex.com/lznuaa/tortoisegit/language/ko/)\n" "MIME-Version: 1.0\n" @@ -728,9 +728,10 @@ msgstr "로그 메시지 폰트(&F):" msgid "&Font:" msgstr "폰트(&F):" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "강제로(&F)" @@ -1244,6 +1245,10 @@ msgstr "통합(&S)" msgid "&Squash ALL" msgstr "모두 통합(&S)" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "시작(&S)" @@ -1348,6 +1353,10 @@ msgstr "알 수 없는 드라이브(&U)" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "위로(&U)" @@ -1403,14 +1412,14 @@ msgstr "예(&Y)" msgid "&add \"cherry picked from\"" msgstr "\"cherry picked from\" 추가(&A)" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "&ignore space change" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "변경을 알 수 없음(&K)" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(TortoiseGit 기본값)" @@ -2923,6 +2932,10 @@ msgstr "활성화된 윈도우를 닫고, 문서를 저장할지 물어 봅니 msgid "Collapse" msgstr "축소" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4666,6 +4679,10 @@ msgstr "실행파일 (+x)" msgid "Exit" msgstr "종료" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "탐색" @@ -5183,10 +5200,6 @@ msgstr "" msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5269,6 +5282,10 @@ msgstr "" msgid "Full data" msgstr "" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "문자열 모두 검색" @@ -5579,6 +5596,14 @@ msgstr "버전관리되지 않는 경로에 대해서 메뉴를 숨깁니다." msgid "Hide Patch<<" msgstr "패치 데이터 숨김<<" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "스크립트 수행 중 숨김" @@ -6220,6 +6245,13 @@ msgstr "유효하지 않은 단위" msgid "Invalid revision number!" msgstr "Invalid revision number!" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6273,7 +6305,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "유지" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "Keep changelists" @@ -6295,7 +6327,7 @@ msgstr "한국어" msgid "L" msgstr "L" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "LFS" @@ -7582,6 +7614,16 @@ msgstr "" msgid "Parent(s)" msgstr "부모" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "암호" @@ -8540,7 +8582,8 @@ msgstr "복원" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "기본값으로 복원" @@ -8694,11 +8737,6 @@ msgstr "" msgid "S" msgstr "S" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9094,8 +9132,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "명령을 수행한 뒤 대화상자를 어떻게 할 것인지 선택합니다." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9131,7 +9169,8 @@ msgstr "Select what file you want to save as\nNote: There is unresolved conflict #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "전체 선택/해제(&A)" @@ -9464,6 +9503,11 @@ msgstr "로그 보기..." msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9695,6 +9739,20 @@ msgstr "누적 막대 그래프" msgid "Stacked Line Graph" msgstr "누적 꺾은 선 그래프" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "표준" @@ -10655,6 +10713,14 @@ msgstr "끝:" msgid "Toggle filters" msgstr "필터 전환" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10774,8 +10840,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseGitIDiff: 이미지 파일 비교 프로그램\n\n가능한 명령행 인자는 다음과 같습니다:\n/left:\"왼쪽 이미지 경로\"\n/lefttitle:\"왼쪽 이미지의 제목\"\n/right:\"오른쪽 이미지의 경로\"\n/righttitle:\"오른쪽 이미지의 제목\"\n/overlay\t\t오버레이 모드 활성화\n/fit\t\t이미지 크기에 맞춤\n/showinfo\t\t이미지 정보 대화 상자를 보임" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10972,6 +11038,11 @@ msgstr "읽기전용 속성이거나 다른 사람이 열고 있어서 %1에 쓸 msgid "Uncheck" msgstr "선택 해제" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11045,6 +11116,16 @@ msgstr "Unresolved conflicts!" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "제목 없음" @@ -11099,30 +11180,10 @@ msgstr "두 파일 비교시 기본값으로 같은 창으로 비교(&O)" msgid "Use &other text block" msgstr "다른 텍스트 블록 사용(&o)" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "'mine' 텍스트 블럭을 사용" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "'mine'→'theirs'의 순서로 텍스트 블럭을 사용" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "'theirs' 테스트 블럭을 사용" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "'theirs'→'mine'의 순서로 텍스트 블럭을 사용" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "Use HTTP path component" @@ -11208,11 +11269,13 @@ msgstr "왼쪽 블럭을 사용" msgid "Use left file" msgstr "왼쪽 파일을 사용" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11232,11 +11295,12 @@ msgstr "정규표현식을 사용" msgid "Use right block" msgstr "Use right block" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11457,10 +11521,19 @@ msgstr ".tgitconfig 보기" msgid "View Bars" msgstr "" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "패치 보기" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11506,8 +11579,8 @@ msgid "Waiting for input" msgstr "입력을 기다리고 있습니다." #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" -msgstr "보기 방법(&H)" +msgid "Walk Be&havior" +msgstr "" #. Resource IDs: (IDS_WARN_WARNING) msgid "Warning" @@ -11593,6 +11666,20 @@ msgstr "URL을 입력할 때, 원격 이름이 비어있는 경우, 원격 이 msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11619,6 +11706,10 @@ msgstr "" msgid "Whitespaces" msgstr "공백문자" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12048,6 +12139,10 @@ msgstr "" msgid "file/foldernames" msgstr "파일/폴더명" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "전체 경로" @@ -12285,10 +12380,6 @@ msgstr "%1" msgid "to %s" msgstr "%s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "알 수 없는 변경(&N)" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "주" diff --git a/Languages/Tortoise_lt.po b/Languages/Tortoise_lt.po index 24b58ea49..a26ff078b 100644 --- a/Languages/Tortoise_lt.po +++ b/Languages/Tortoise_lt.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Lithuanian (http://www.transifex.com/lznuaa/tortoisegit/language/lt/)\n" "MIME-Version: 1.0\n" @@ -714,9 +714,10 @@ msgstr "&Šriftas žurnalo pranešimams:" msgid "&Font:" msgstr "&Šriftas:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "" @@ -1230,6 +1231,10 @@ msgstr "" msgid "&Squash ALL" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "Pradėti" @@ -1334,6 +1339,10 @@ msgstr "&Nežinomi diskai" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "" @@ -1389,12 +1398,12 @@ msgstr "Taip" msgid "&add \"cherry picked from\"" msgstr "Pridėti \"&Atrinkta iš\"" -#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) -msgid "&ignore space change" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" +#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) +msgid "&ignore space change" msgstr "" #. Resource IDs: (IDS_TORTOISEGITDEFAULT) @@ -2909,6 +2918,10 @@ msgstr "" msgid "Collapse" msgstr "Sutraukti" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4652,6 +4665,10 @@ msgstr "" msgid "Exit" msgstr "" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "" @@ -5169,10 +5186,6 @@ msgstr "Priverstinai perkelti ir apjungti, net jei ši šaka yra paveldima iš p msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5255,6 +5268,10 @@ msgstr "Pilni patvirtinimo duomenys be kelio pakeitimų" msgid "Full data" msgstr "" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "" @@ -5565,6 +5582,14 @@ msgstr "" msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Slėpti skriptą vykdymo metu" @@ -6206,6 +6231,13 @@ msgstr "" msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6259,7 +6291,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "" @@ -6281,7 +6313,7 @@ msgstr "" msgid "L" msgstr "" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7568,6 +7600,16 @@ msgstr "" msgid "Parent(s)" msgstr "" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "" @@ -8526,7 +8568,8 @@ msgstr "" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "" @@ -8680,11 +8723,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9080,7 +9118,7 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." +"Select the behavior of the progress dialog at the end of the operation." msgstr "" #. Resource IDs: (57642) @@ -9117,7 +9155,8 @@ msgstr "" #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "Pažymėti/&atžymėti visus" @@ -9450,6 +9489,11 @@ msgstr "" msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9681,6 +9725,20 @@ msgstr "" msgid "Stacked Line Graph" msgstr "" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "" @@ -10641,6 +10699,14 @@ msgstr "Į:" msgid "Toggle filters" msgstr "Perjungti filtrus" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10760,8 +10826,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10958,6 +11024,11 @@ msgstr "" msgid "Uncheck" msgstr "Nepažymėti" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11031,6 +11102,16 @@ msgstr "" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Bevardis" @@ -11085,30 +11166,10 @@ msgstr "" msgid "Use &other text block" msgstr "" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "Naudoti .mailmap" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11194,11 +11255,13 @@ msgstr "" msgid "Use left file" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11218,11 +11281,12 @@ msgstr "" msgid "Use right block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11443,10 +11507,19 @@ msgstr "" msgid "View Bars" msgstr "" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11492,7 +11565,7 @@ msgid "Waiting for input" msgstr "" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11579,6 +11652,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11605,6 +11692,10 @@ msgstr "" msgid "Whitespaces" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12034,6 +12125,10 @@ msgstr "" msgid "file/foldernames" msgstr "" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "" @@ -12271,10 +12366,6 @@ msgstr "į %1" msgid "to %s" msgstr "į %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "&nežinomi pakeitimai" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "savaitė" diff --git a/Languages/Tortoise_nl.po b/Languages/Tortoise_nl.po index 6bc448af2..1f1efc8b9 100644 --- a/Languages/Tortoise_nl.po +++ b/Languages/Tortoise_nl.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Dutch (http://www.transifex.com/lznuaa/tortoisegit/language/nl/)\n" "MIME-Version: 1.0\n" @@ -721,9 +721,10 @@ msgstr "&Lettertype voor logboek:" msgid "&Font:" msgstr "&Lettertype:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "&Forceer" @@ -1237,6 +1238,10 @@ msgstr "&Samenvoegen" msgid "&Squash ALL" msgstr "Voeg ALLES &samen" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Start" @@ -1341,6 +1346,10 @@ msgstr "Onbekende s&tations" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "O&mhoog" @@ -1396,14 +1405,14 @@ msgstr "&Ja" msgid "&add \"cherry picked from\"" msgstr "&Voeg \"Nauwkeurig kiezen van\" toe" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "negeer spat&ie wijzigingen" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "be&kende wijzigingen" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(TortoiseGit standaard)" @@ -2916,6 +2925,10 @@ msgstr "Sluit het actieve venster en vraagt om de bestanden op te slaan" msgid "Collapse" msgstr "Inklappen" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4659,6 +4672,10 @@ msgstr "Uitvoerbaar (+x)" msgid "Exit" msgstr "Afsluiten" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Verkennen naar" @@ -5176,10 +5193,6 @@ msgstr "" msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "Forceer: Overschrijf" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5262,6 +5275,10 @@ msgstr "" msgid "Full data" msgstr "Volledige data" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "Doorzoek tekst" @@ -5572,6 +5589,14 @@ msgstr "Verberg menu's voor paden buiten versiebeheer" msgid "Hide Patch<<" msgstr "Verberg Patch<<" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Verberg script bij uitvoeren" @@ -6213,6 +6238,13 @@ msgstr "Ongeldige valuta." msgid "Invalid revision number!" msgstr "Ongeldig revisienummer!" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6266,7 +6298,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "Behouden" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "Werksets bewaren" @@ -6288,7 +6320,7 @@ msgstr "Koreaans" msgid "L" msgstr "L" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "LFS" @@ -7575,6 +7607,16 @@ msgstr "Oorsprong van %2!s!" msgid "Parent(s)" msgstr "Oorsprong(en)" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Wachtwoord" @@ -8533,7 +8575,8 @@ msgstr "Herstel" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Standaard herstellen" @@ -8687,11 +8730,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9087,8 +9125,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Kies het gewenste gedrag van het voortgangsvenster na afloop van de actie." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9124,7 +9162,8 @@ msgstr "Selecteer als welk bestand u wilt opslaan\nLet op: Er is een onopgelost #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "Selecteer/deselecteer &alles" @@ -9457,6 +9496,11 @@ msgstr "Toon logboek..." msgid "Show long format even if a tag is exactly on that commit" msgstr "Toon lang formaat zelfs als een tag zich precies op die commit bevindt" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9688,6 +9732,20 @@ msgstr "Gestapeld staafdiagram" msgid "Stacked Line Graph" msgstr "Gestapeld lijndiagram" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Standaard" @@ -10648,6 +10706,14 @@ msgstr "Aan:" msgid "Toggle filters" msgstr "Schakel filters in of uit" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10767,8 +10833,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseGitIDiff: de afbeelding vergelijker voor TortoiseSVN\n\nBeschikbare parameters zijn:\n/left:\"pad naar linker afbeelding\"\n/lefttitle:\"titel voor linker afbeelding\"\n/right:\"pad naar rechter afbeelding\"\n/righttitle:\"titel voor rechter afbeelding\"\n/overlay\t\tactiveert overlay modus\n/fit\t\t\tpast afbeeldingen op elkaar\n/showinfo\t\ttoont afbeeldingsinformatie" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10965,6 +11031,11 @@ msgstr "Kan niet schrijven naar %1, het is geopend door iemand anders of als all msgid "Uncheck" msgstr "Niet markeren" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11038,6 +11109,16 @@ msgstr "Onopgeloste conflicten!" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Naamloos" @@ -11092,30 +11173,10 @@ msgstr "&Enkel-venster als standaard instellen voor 2-weg Diff" msgid "Use &other text block" msgstr "Gebruik &ander tekstgedeelte" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Gebruik 'mijn' tekstblok" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Gebruik 'mijn' tekstblok en dan 'hun' tekstblok" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Gebruik 'hun' tekstblok" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Gebruik 'hun' tekstblok en dan 'mijn' tekstblok" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr ".Mailmap gebruiken" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "Gebruik HTTP padcomponent" @@ -11201,11 +11262,13 @@ msgstr "Gebruik linker blok" msgid "Use left file" msgstr "Gebruik het linker bestand" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11225,11 +11288,12 @@ msgstr "Gebruik reguliere expressie" msgid "Use right block" msgstr "Gebruik rechterblok" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11450,10 +11514,19 @@ msgstr "Bekijk .tgitconfig" msgid "View Bars" msgstr "Bekijk Bars" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "Bekijk Patch" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11499,7 +11572,7 @@ msgid "Waiting for input" msgstr "Wachten op input" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11586,6 +11659,20 @@ msgstr "Wanneer je de URL invult zal de remote name automatisch ingevuld worden msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "Of alleen geannoteerde tags, alle tags of alle referenties gerefereerd dienen te worden" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11612,6 +11699,10 @@ msgstr "Wijzigingen in witruimte (tabs, spaties)" msgid "Whitespaces" msgstr "Spaties en lege regels" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12041,6 +12132,10 @@ msgstr "bestand, niet een submodule" msgid "file/foldernames" msgstr "bestand/foldernamen" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "volledige paden" @@ -12278,10 +12373,6 @@ msgstr "naar %1" msgid "to %s" msgstr "naar %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "o&nbekende wijzigingen" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "week" diff --git a/Languages/Tortoise_oc.po b/Languages/Tortoise_oc.po index b3fd17986..19b21260e 100644 --- a/Languages/Tortoise_oc.po +++ b/Languages/Tortoise_oc.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+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" @@ -706,9 +706,10 @@ msgstr "&Poliça dels comentaris :" msgid "&Font:" msgstr "&Poliça :" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "" @@ -1222,6 +1223,10 @@ msgstr "" msgid "&Squash ALL" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "" @@ -1326,6 +1331,10 @@ msgstr "&Disques desconeguts" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "" @@ -1381,12 +1390,12 @@ msgstr "" msgid "&add \"cherry picked from\"" msgstr "" -#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) -msgid "&ignore space change" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" +#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) +msgid "&ignore space change" msgstr "" #. Resource IDs: (IDS_TORTOISEGITDEFAULT) @@ -2901,6 +2910,10 @@ msgstr "Tampar la fenèstra amb demanda de confirmacion d'enregistrament" msgid "Collapse" msgstr "Replegar" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4644,6 +4657,10 @@ msgstr "" msgid "Exit" msgstr "Quitar" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Explorar cap a" @@ -5161,10 +5178,6 @@ msgstr "" msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5247,6 +5260,10 @@ msgstr "" msgid "Full data" msgstr "Donadas completas" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "" @@ -5557,6 +5574,14 @@ msgstr "Amagar los menús pels dorsièrs non versionats" msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Amagar l'escript pendent l'execucion" @@ -6198,6 +6223,13 @@ msgstr "Moneda Invalida." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6251,7 +6283,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "" @@ -6273,7 +6305,7 @@ msgstr "" msgid "L" msgstr "" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7560,6 +7592,16 @@ msgstr "" msgid "Parent(s)" msgstr "" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Senhal" @@ -8518,7 +8560,8 @@ msgstr "Restablís" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Valors per defaut" @@ -8672,11 +8715,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9072,8 +9110,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Seleccionatz lo comportement del dialòg de progression en fin d'operacion" +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9109,7 +9147,8 @@ msgstr "Seleccionar quin fichièr volètz enregistrar jos\nAtencion : I a un con #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "" @@ -9442,6 +9481,11 @@ msgstr "" msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9673,6 +9717,20 @@ msgstr "Grafic en barra empilat" msgid "Stacked Line Graph" msgstr "Grafic en linha empilat" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Estandard" @@ -10633,6 +10691,14 @@ msgstr "Au :" msgid "Toggle filters" msgstr "" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10752,8 +10818,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10950,6 +11016,11 @@ msgstr "Impossible d'escriure dins %1, es en lectura sola o dobèrt per qualqu'u msgid "Uncheck" msgstr "Anullar seleccion" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11023,6 +11094,16 @@ msgstr "I a de conflictes pas resolguts !" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Sens nom" @@ -11077,30 +11158,10 @@ msgstr "Utilizar la vista panèl unic per defaut p&els diff de 2 fichièrs" msgid "Use &other text block" msgstr "Utilizar l'autre bl&òt de tèxte" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Utilizatz 'mon' blòt de tèxte" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Utilizatz 'mon' blòt de tèxte puèi lo 'lor'" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Utilizatz 'lor' blòt de tèxte" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Utilizatz 'lor' blòt de tèxte puèi lo 'mien'" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11186,11 +11247,13 @@ msgstr "Utilizar lo blòt d'esquèrra" msgid "Use left file" msgstr "Utilizar lo fichièr esquèrra" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11210,11 +11273,12 @@ msgstr "Utilizar las expressions regularas" msgid "Use right block" msgstr "Utilizar lo blòt de dreita" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11435,10 +11499,19 @@ msgstr "" msgid "View Bars" msgstr "Veire las Barras" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11484,7 +11557,7 @@ msgid "Waiting for input" msgstr "" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11571,6 +11644,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11597,6 +11684,10 @@ msgstr "Cambiaments d'espacis blancs (tabulacions, espacis)" msgid "Whitespaces" msgstr "Espacements" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12026,6 +12117,10 @@ msgstr "" msgid "file/foldernames" msgstr "fichièrs/noms de repertòri" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "Camins complets" @@ -12263,10 +12358,6 @@ msgstr "cap a %1" msgid "to %s" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "setmana" diff --git a/Languages/Tortoise_pl.po b/Languages/Tortoise_pl.po index 9df72823f..94287710a 100644 --- a/Languages/Tortoise_pl.po +++ b/Languages/Tortoise_pl.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -13,15 +13,17 @@ # Kuba Niewiarowski , 2018,2020 # Lübbe Onken , 2011 # Lübbe Onken , 2011 +# Łukasz Fortuna , 2021 # lukaszkoziara , 2017 # Michał Lipok , 2015 +# Mariusz K, 2022 # mkrawiecki , 2011 # Pablos , 2012,2016 # Pablos , 2016 # Sebastian Kaczorowski , 2015-2016,2021 # StasiekK <2stan2@gmail.com>, 2016 # StasiekK <2stan2@gmail.com>, 2016 -# Sven Strickroth , 2020 +# Sven Strickroth , 2020-2021 # taksun , 2019-2021 # taksun , 2014 msgid "" @@ -29,8 +31,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: 2021-03-28 20:07+0000\n" -"Last-Translator: taksun \n" +"PO-Revision-Date: 2022-01-20 21:49+0000\n" +"Last-Translator: Mariusz K\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" @@ -723,9 +725,10 @@ msgstr "&Czcionka opisów zmian:" msgid "&Font:" msgstr "&Czcionka:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "&Wymuś" @@ -1239,6 +1242,10 @@ msgstr "" msgid "&Squash ALL" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Start" @@ -1343,6 +1350,10 @@ msgstr "&Dyski nieznanych typów" msgid "&Unlock" msgstr "&Odblokuj" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "&W górę" @@ -1398,14 +1409,14 @@ msgstr "Tak" msgid "&add \"cherry picked from\"" msgstr "dod&aj \"selekcyjnie zatwierdzono z\"" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "&Ignoruj zmiany białych znaków" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "&znane zmiany" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(domyślna TortoiseGit)" @@ -2918,6 +2929,10 @@ msgstr "Zamyka aktywne okno z pytaniem o zapisanie zmian w dokumencie" msgid "Collapse" msgstr "Zwiń" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -3673,7 +3688,7 @@ msgstr "Ciemny temat" msgid "" "Dark theme requires at least Win10 1803, and it must be enabled in the " "Windows system settings." -msgstr "" +msgstr "Ciemny motyw wymaga systemu Windows10 w wersji 1803 lub nowszej i musi być włączony w ustawieniach systemu Windows." #. Resource IDs: (IDS_LOG_DATE, IDS_STATUSLIST_COLDATE) msgid "Date" @@ -4418,7 +4433,7 @@ msgstr "Edytuj..." #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1770, Dialog IDD_SETTINGSDIALOGS3: #. Control id 1770) msgid "Effective" -msgstr "" +msgstr "Efektywny" #. Resource IDs: (IDS_SETTINGS_PROXYSERVER_TT) msgid "Either the name or IP of the proxy server" @@ -4450,7 +4465,7 @@ msgstr "Włącz KonfigEdytora" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 1766) msgid "Enable Gravatar" -msgstr "" +msgstr "Włącz Gravatara" #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 1788) msgid "Enable drag context menu" @@ -4467,7 +4482,7 @@ msgstr "Włącz pamięć podręczną zapisów" #. Resource IDs: (IDS_SETTINGS_ENABLEGRAVATAR_TT) msgid "Enable showing Gravatar image in Log Dialog" -msgstr "" +msgstr "Włącz wyświetlanie obrazu Gravatara w oknie dziennika" #. Resource IDs: (Dialog IDD_FIRSTSTARTWIZARD_GIT: Control id 1842) msgid "Enable special hack for Cygwin git" @@ -4661,6 +4676,10 @@ msgstr "Pliki wykonywalne (+x)" msgid "Exit" msgstr "Wyjdź" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Eksploruj do" @@ -5026,11 +5045,11 @@ msgstr "Znajdź" #. Resource IDs: (cmdFindNext_LabelTitle_RESID) msgid "Find Next" -msgstr "" +msgstr "Znajdź następny" #. Resource IDs: (cmdFindPrev_LabelTitle_RESID) msgid "Find Previous" -msgstr "" +msgstr "Znajdź poprzedni" #. Resource IDs: (cmdFindPrev) msgid "" @@ -5178,10 +5197,6 @@ msgstr "" msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5264,6 +5279,10 @@ msgstr "" msgid "Full data" msgstr "Pełne dane" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "Pełna historia" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "Wyszukiwanie pełnotekstowe" @@ -5385,7 +5404,7 @@ msgstr "Git Ustawienia zdalne" #. Resource IDs: (IDS_OUTPUT_WND) msgid "Git Revision List" -msgstr "" +msgstr "Lista rewizji Git" #. Resource IDs: (IDS_MENUSVNDCOMMIT_DESC) msgid "Git SVN DCommit" @@ -5510,7 +5529,7 @@ msgstr "Grupuj listy zmian" #. Resource IDs: (IDS_SHOWFILES_HIDEPATHS) msgid "H&ide Unrelated Changed Paths" -msgstr "" +msgstr "Ukryj niepowiązane zmienione ścieżki" #. Resource IDs: (Dialog IDD_DIFFFILES: Control id 1353, Dialog IDD_DIFFFILES: #. Control id 1354, Dialog IDD_REPOSITORY_BROWSER: Control id 1684) @@ -5574,6 +5593,14 @@ msgstr "Ukryj menu dla niewersjonowanych ścieżek" msgid "Hide Patch<<" msgstr "Ukryj poprawki<<" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Ukryj skrypt kiedy jest wykonywany" @@ -5584,7 +5611,7 @@ msgstr "" #. Resource IDs: (IDS_HIDEUNCHANGED) msgid "Hide unchanged" -msgstr "" +msgstr "Ukryj niezmienione" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1781, #. IDS_REFCOMPAREHIDEUNCHANGED_TT) @@ -6215,6 +6242,13 @@ msgstr "Niewłaściwa waluta." msgid "Invalid revision number!" msgstr "Błędny numer wersji!" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6268,7 +6302,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "Zachowaj" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "Zachowaj listy zmian" @@ -6290,7 +6324,7 @@ msgstr "koreański" msgid "L" msgstr "L" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7492,7 +7526,7 @@ msgstr "Output.prn" #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) msgid "Overlay Handlers" -msgstr "" +msgstr "Uchwyty nakładek" #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" @@ -7577,6 +7611,16 @@ msgstr "" msgid "Parent(s)" msgstr "Rodzic(e)" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Hasło" @@ -8535,7 +8579,8 @@ msgstr "Przywrócenie" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Przywróć domyślne" @@ -8689,11 +8734,6 @@ msgstr "" msgid "S" msgstr "S" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -8777,7 +8817,7 @@ msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) msgid "SafeCrLf:" -msgstr "" +msgstr "SafeCrLf:" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9089,8 +9129,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Określa zachowanie wskaźnika zaawansowania po zakończeniu operacji." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9126,7 +9166,8 @@ msgstr "Wybierz, który plik chcesz zapisać pod inną nazwą\nUwaga: Występuje #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "Zaznacz/odznacz &wszystko" @@ -9459,6 +9500,11 @@ msgstr "Pokaż log..." msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9546,14 +9592,14 @@ msgstr "Pokaż/ukryj" #. Resource IDs: (IDS_REFBROWSE_INFO) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" -msgstr "" +msgstr "Pokazano %1!d! rewizji, %2!d! rewizji zaznaczono" #. Resource IDs: (IDS_PROC_LOG_STATS) #, c-format msgid "" "Showing %1!ld! revision(s), from revision %2!s! to revision %3!s! - %4!ld! " "revision(s) selected, %5!ld! file(s) selected" -msgstr "" +msgstr "Pokazano %1!ld! rewizji, od %2!s! do %3!s! - wybranych rewizji: %4!ld!, wybranych plików: %5!ld!" #. Resource IDs: (IDS_MENUDESCREVISIONGRAPH) msgid "Shows a graphical representation of copies/tags/branches" @@ -9690,6 +9736,20 @@ msgstr "Skumulowany wykres kolumnowy" msgid "Stacked Line Graph" msgstr "Skumulowany wykres liniowy" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Standard" @@ -10389,7 +10449,7 @@ msgstr "" msgid "" "The process is still running.\n" "Are you sure to abort?" -msgstr "" +msgstr "Proces wciąż pracuje.\nCzy na pewno chcesz przerwać?" #. Resource IDs: (IDS_ERR_INVALIDREGEX) msgid "" @@ -10650,6 +10710,14 @@ msgstr "Do:" msgid "Toggle filters" msgstr "" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10694,7 +10762,7 @@ msgid "" "To use TortoiseGit please open the explorer and right-click on any folder you like\n" "to bring up the context menu where you will find all TortoiseGit commands.\n" "And read the manual!" -msgstr "" +msgstr "TortoiseGit jest rozszerzeniem powłoki.\nOznacza to, że jest zintegrowany z Eksploratorem systemu Windows.\nAby użyć TortoiseGit otwórz eksploratora i kliknij prawym przyciskiem myszy na dowolnie wybrany folder\nw celu wywołania menu kontekstowego, w którym znajdziesz wszystkie polecenia TortoiseGit.\nPrzeczytaj też dokumentację!" #. Resource IDs: (IDS_FIRSTSTART_HINT1) msgid "" @@ -10745,7 +10813,7 @@ msgid "" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "" +msgstr "TortoiseGitBlame\n\nTortoiseGitBlame\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10769,8 +10837,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseGitIDiff: przeglądarka różnic obrazów dla TortoiseSVN\n\nDostępne parametry linii komend:\n/left:\"ścieżka do lewego obrazu\"\n/lefttitle:\"tytuł do pokazania dla lewego obrazu\"\n/right:\"ścieżka do prawego obrazu\"\n/righttitle:\"tytuł do pokazania dla prawego obrazu\"\n/overlay\t\taby włączyć tryb nakładki\n/fit\t\taby dopasować rozmiary obrazów\n/showinfo\t\taby pokazać informacje o obrazach" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10967,6 +11035,11 @@ msgstr "Nie można zapisać %1, jest przeznaczony tylko do odczytu lub jest otwa msgid "Uncheck" msgstr "Odznacz" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11040,6 +11113,16 @@ msgstr "Nierozwiązane konflikty!" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Bez nazwy" @@ -11094,30 +11177,10 @@ msgstr "Porównując dwa pliki użyj widoku &jednego panelu" msgid "Use &other text block" msgstr "Użyj innego &bloku tekstu" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Użyj bloku tekstu z 'mój'" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Użyj bloków tekstu z 'mój' przed 'ich'" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Użyj bloku tekstu z 'ich'" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Użyj bloków tekstu z 'ich' przed 'mój'" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "Użyj pliku .mailmap" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "Użyj składnika ścieżki HTTP" @@ -11203,11 +11266,13 @@ msgstr "Użyj lewego bloku" msgid "Use left file" msgstr "Użyj pliku po lewej" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11227,11 +11292,12 @@ msgstr "Użyj wyrażenia regularnego" msgid "Use right block" msgstr "Użyj prawego bloku" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11452,10 +11518,19 @@ msgstr "Zobacz plik .tgitconfig" msgid "View Bars" msgstr "Paski Widoku" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "Zobacz poprawkę" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11501,7 +11576,7 @@ msgid "Waiting for input" msgstr "" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11588,6 +11663,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11614,6 +11703,10 @@ msgstr "Zmiany białych znaków (tabulatory, spacje)" msgid "Whitespaces" msgstr "Białe znaki" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12043,6 +12136,10 @@ msgstr "plik, nie podmoduł" msgid "file/foldernames" msgstr "nazwy plików/folderów" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "pełne ścieżki" @@ -12054,7 +12151,7 @@ msgstr "Polecenie git nie zostało zakończone pomyślnie (kod wyjścia %d)" #. Resource IDs: (IDS_GITEXEFILEFILTER) msgid "git.exe|git.exe||" -msgstr "" +msgstr "git.exe|git.exe||" #. Resource IDs: (IDS_STATUSIGNORED) msgid "ignored" @@ -12120,19 +12217,19 @@ msgstr "menedżer - bieżący użytkownik Windowsa" #. Resource IDs: (IDS_LOCAL_GCM) msgid "manager - this repository only" -msgstr "" +msgstr "manager - wyłącznie bieżące repozytorium" #. Resource IDs: (IDS_SYSTEM_GCMCORE) msgid "manager-core - all Windows users" -msgstr "" +msgstr "manager-core - wszyscy użytkownicy Windowsa" #. Resource IDs: (IDS_GLOBAL_GCMCORE) msgid "manager-core - current Windows user" -msgstr "" +msgstr "manager-core - bieżący użytkownik Windowsa" #. Resource IDs: (IDS_LOCAL_GCMCORE) msgid "manager-core - this repository only" -msgstr "" +msgstr "manager-core - wyłącznie bieżące repozytorium" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1494) msgid "master" @@ -12280,10 +12377,6 @@ msgstr "do %1" msgid "to %s" msgstr "do %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "&nieznane zmiany" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "tydzień" diff --git a/Languages/Tortoise_pt_BR.po b/Languages/Tortoise_pt_BR.po index 9317d05d5..a92206c75 100644 --- a/Languages/Tortoise_pt_BR.po +++ b/Languages/Tortoise_pt_BR.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -29,14 +29,14 @@ # Paulo Pires , 2015 # Rafael H L Moretti , 2016 # Rafael Neri , 2014 -# Ricardo Souza (RCDMK) , 2012 -# Ricardo Souza (RCDMK) , 2012,2016-2018 -# Ricardo Souza (RCDMK) , 2016 -# Ricardo Souza (RCDMK) , 2012-2015 +# Ricardo Souza , 2012 +# Ricardo Souza , 2012,2016-2018 +# Ricardo Souza , 2016 +# Ricardo Souza , 2012-2015 # Rodrigo Monte , 2014 # Samuel Facchinello (samuelfac) , 2017 # Samuel Facchinello (samuelfac) , 2017 -# Sven Strickroth , 2012-2015 +# Sven Strickroth , 2012-2015,2021 # Thiago Feldhaus , 2016,2018 # Thiago Feldhaus , 2016 # Thiago Feldhaus , 2016,2019 @@ -48,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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+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" @@ -742,9 +742,10 @@ msgstr "&Fonte para mensagens de histórico:" msgid "&Font:" msgstr "&Fonte:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "&Forçar" @@ -1258,6 +1259,10 @@ msgstr "&Esmagar" msgid "&Squash ALL" msgstr "&Esmagar TUDO" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Iniciar" @@ -1362,6 +1367,10 @@ msgstr "Unidades &desconhecidas" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "&Acima" @@ -1417,14 +1426,14 @@ msgstr "&Sim" msgid "&add \"cherry picked from\"" msgstr "&adicionar \"escolha seletiva a partir de\"" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "&ignorar dif. de espaço" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "mudanças &conhecidas" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(Padrão TortoiseGit)" @@ -2151,7 +2160,7 @@ msgstr "Converter automaticamente 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" @@ -2177,7 +2186,7 @@ msgstr "O autocompletar sugere palavras (geralmente nomes de classes ou\nmembros #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) msgid "AutoCrLf:" -msgstr "" +msgstr "AutoCrLf:" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" @@ -2937,6 +2946,10 @@ msgstr "Fecha a janela ativa e pede para salvar os documentos" msgid "Collapse" msgstr "Encolher" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -2955,15 +2968,15 @@ msgstr "Cores" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) msgid "Colors 1" -msgstr "" +msgstr "Cores 1" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) msgid "Colors 2" -msgstr "" +msgstr "Cores 2" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) msgid "Colors 3" -msgstr "" +msgstr "Cores 3" #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format @@ -3243,11 +3256,11 @@ msgstr "Conflitos: %d" #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) msgid "Context Menu" -msgstr "" +msgstr "Menu de Contexto" #. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) msgid "Context Menu 2" -msgstr "" +msgstr "Menu de Contexto 2" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" @@ -3374,7 +3387,7 @@ msgid "" "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 "" +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\"." #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) #, c-format @@ -3928,15 +3941,15 @@ msgstr "Diálogos" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) msgid "Dialogs 1" -msgstr "" +msgstr "Diálogos 1" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) msgid "Dialogs 2" -msgstr "" +msgstr "Diálogos 2" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) msgid "Dialogs 3" -msgstr "" +msgstr "Diálogos 3" #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" @@ -4680,6 +4693,10 @@ msgstr "Executável (+x)" msgid "Exit" msgstr "Sair" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Explorar" @@ -5197,10 +5214,6 @@ msgstr "Força a reorganização mesmo se o ramo atual é um descendente da subm msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "Forçar: Pode descartar" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5219,14 +5232,14 @@ msgstr "Avançar %d" msgid "" "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 "" +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\"." #. 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 running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." -msgstr "" +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." #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) msgid "" @@ -5283,6 +5296,10 @@ msgstr "Dados da submissão completos sem caminhos alterados" msgid "Full data" msgstr "Todos os dados" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "Busca de texto completa" @@ -5593,6 +5610,14 @@ msgstr "Ocultar Menus para caminhos não versionados" msgid "Hide Patch<<" msgstr "Ocultar Correções" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Ocultar scrip durante execução" @@ -6234,13 +6259,20 @@ msgstr "Moeda inválida." msgid "Invalid revision number!" msgstr "Número de revisão inválido!" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" -msgstr "" +msgstr "Configuração dos Rastreadores de Problemas" #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) msgid "Issue Tracker Integration" -msgstr "" +msgstr "Integração com o Rastreador de Problemas" #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" @@ -6287,7 +6319,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "Manter" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "Manter listas de alterações" @@ -6309,7 +6341,7 @@ msgstr "Coreano" msgid "L" msgstr "L" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "LFS" @@ -6724,7 +6756,7 @@ msgstr "Reintegrar Combinação" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) msgid "Merge Tool" -msgstr "" +msgstr "Ferramenta de Combinação" #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" @@ -7511,7 +7543,7 @@ msgstr "Output.prn" #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) msgid "Overlay Handlers" -msgstr "" +msgstr "Gerenciadores de Sobreposição" #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" @@ -7596,6 +7628,16 @@ msgstr "Pai de %2!s!" msgid "Parent(s)" msgstr "Pai(s)" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Senha" @@ -8554,7 +8596,8 @@ msgstr "Restaurar" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Restaurar padrão" @@ -8708,11 +8751,6 @@ msgstr "Executar quando o caminho do diretório de trabalho está sob:" msgid "S" msgstr "S" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "Mostrar(&h) arquivos modificados na árvore" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "&Pular não selecionados" @@ -8796,7 +8834,7 @@ msgstr "CrLfSe&guro:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) msgid "SafeCrLf:" -msgstr "" +msgstr "SafeCrLf:" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9108,8 +9146,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Selecione o comportamento do diálogo de progresso ao final da operação." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9145,7 +9183,8 @@ msgstr "Selecione que arquivo você quer salvar como\nNota: Existem conflitos n #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "Marcar/desmarcar &todos" @@ -9478,6 +9517,11 @@ msgstr "Exibir histórico..." msgid "Show long format even if a tag is exactly on that commit" msgstr "Mostrar formato longo, mesmo que uma marca é exatamente sobre essa confirmação" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9709,6 +9753,20 @@ msgstr "Barra de Gráfico em Pilha" msgid "Stacked Line Graph" msgstr "Barra de Gráfico em Linha" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Padrão" @@ -10669,6 +10727,14 @@ msgstr "Para:" msgid "Toggle filters" msgstr "Alternar filtros" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10788,8 +10854,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseIDiff: o visualizador para comparação entre imagens para TortoiseSVN\n\nParâmetros disponíveis por linha de comando são:\n/left:\"caminho para a figura a esquerda\"\n/lefttitle:\"titulo para a figura da esquerda\"\n/right:\"caminho para a figura da direita\"\n/righttitle:\"titulo para a figura da direita\"\n/overlay\t\tpara o modo de sobreposição\n/fit\t\tpara ajustar o tamanho das imagens\n/showinfo\t\tpara exibir as caixas de informações das imagens" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10986,6 +11052,11 @@ msgstr "Impossível escrever para %1, é somente-leitura ou está aberto por out msgid "Uncheck" msgstr "Desmarcar" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11059,6 +11130,16 @@ msgstr "Conflitos não resolvidos!" msgid "Unset tracked branch" msgstr "Remover ramo rastreado" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Sem Título" @@ -11113,30 +11194,10 @@ msgstr "Usar visualização de &um painel por padrão para comparação de 2 arq msgid "Use &other text block" msgstr "Usar &outro bloco de texto" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Usar 'meu' bloco de texto" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Usar 'meu' bloco de texto e então o 'deles'" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Usar bloco de texto 'deles'" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Usar bloco de texto 'deles' depois o 'meu'" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "Usar .mailmap" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "Usar componente de caminho HTTP" @@ -11222,11 +11283,13 @@ msgstr "Usar bloco da esquerda" msgid "Use left file" msgstr "Usar arquivo da esquerda" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "Usar bloco de texto da esquerda" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "Usar bloco de texto da esquerda e então da direita" @@ -11246,11 +11309,12 @@ msgstr "Usar expressão regular" msgid "Use right block" msgstr "Usar bloco direito" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "Usar bloco de texto da direita" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "Usar bloco de texto da direita e então da esquerda" @@ -11471,10 +11535,19 @@ msgstr "Ver .tgitconfig" msgid "View Bars" msgstr "Visualizar Barras" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "Ver Correções" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11520,8 +11593,8 @@ msgid "Waiting for input" msgstr "Aguardando por entrada" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" -msgstr "&Comportamento de Travessia" +msgid "Walk Be&havior" +msgstr "" #. Resource IDs: (IDS_WARN_WARNING) msgid "Warning" @@ -11607,6 +11680,20 @@ msgstr "Quando você digitar a URL, o nome remoto será preenchido automaticamen msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "Quando referenciar tags anotadas, todas as marcas ou todas as referências" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11633,6 +11720,10 @@ msgstr "Mudanças de espaço em branco (tabulações, espaços)" msgid "Whitespaces" msgstr "Espaços em branco" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12062,6 +12153,10 @@ msgstr "arquivo, não um submódulo" msgid "file/foldernames" msgstr "nomes de arquivos/pastas" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "caminhos completos" @@ -12131,27 +12226,27 @@ msgstr "linhas: %d(+) %d(-) arquivos: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s #. Resource IDs: (IDS_SYSTEM_GCM) msgid "manager - all Windows users" -msgstr "gerenciador - todos os usuários do Windows" +msgstr "manager - todos os usuários do Windows" #. Resource IDs: (IDS_GLOBAL_GCM) msgid "manager - current Windows user" -msgstr "gerenciador - usuário atual do Windows" +msgstr "manager - usuário atual do Windows" #. Resource IDs: (IDS_LOCAL_GCM) msgid "manager - this repository only" -msgstr "gerenciador - este repositório apenas" +msgstr "manager - este repositório apenas" #. Resource IDs: (IDS_SYSTEM_GCMCORE) msgid "manager-core - all Windows users" -msgstr "" +msgstr "manager-core - todos os usuários do Windows" #. Resource IDs: (IDS_GLOBAL_GCMCORE) msgid "manager-core - current Windows user" -msgstr "" +msgstr "manager-core - usuário atual do Windows" #. Resource IDs: (IDS_LOCAL_GCMCORE) msgid "manager-core - this repository only" -msgstr "" +msgstr "manager-core - este repositório apenas" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1494) msgid "master" @@ -12299,10 +12394,6 @@ msgstr "para %1" msgid "to %s" msgstr "para %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "mudanças &desconhecidas" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "semana" diff --git a/Languages/Tortoise_pt_PT.po b/Languages/Tortoise_pt_PT.po index 7f499c823..c65f2bd2b 100644 --- a/Languages/Tortoise_pt_PT.po +++ b/Languages/Tortoise_pt_PT.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+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" @@ -719,9 +719,10 @@ msgstr "&Tipo de letra para mensagens de registo:" msgid "&Font:" msgstr "&Tipo de letra:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "&Forçar" @@ -1235,6 +1236,10 @@ msgstr "" msgid "&Squash ALL" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "" @@ -1339,6 +1344,10 @@ msgstr "Dispositivos &desconhecidos" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "" @@ -1394,12 +1403,12 @@ msgstr "" msgid "&add \"cherry picked from\"" msgstr "" -#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) -msgid "&ignore space change" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" +#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) +msgid "&ignore space change" msgstr "" #. Resource IDs: (IDS_TORTOISEGITDEFAULT) @@ -2914,6 +2923,10 @@ msgstr "Fecha a janela activa e pergunta se se deseja guardar os documentos" msgid "Collapse" msgstr "colapsar" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4657,6 +4670,10 @@ msgstr "" msgid "Exit" msgstr "Sair" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Explorar para" @@ -5174,10 +5191,6 @@ msgstr "" msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5260,6 +5273,10 @@ msgstr "" msgid "Full data" msgstr "Dados completos" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "" @@ -5570,6 +5587,14 @@ msgstr "Esconder menus para caminhos não versionados" msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Ocultar o script durante a sua execução" @@ -6211,6 +6236,13 @@ msgstr "Moeda Inválida." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6264,7 +6296,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "Manter listas de alterações" @@ -6286,7 +6318,7 @@ msgstr "" msgid "L" msgstr "" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7573,6 +7605,16 @@ msgstr "" msgid "Parent(s)" msgstr "" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Palavra-passe:" @@ -8531,7 +8573,8 @@ msgstr "Restaurar" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Restaurar Valores por Omissão" @@ -8685,11 +8728,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9085,8 +9123,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Seleccionar o comportamento da caixa de diálogo de progresso no final da operação." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9122,7 +9160,8 @@ msgstr "Seleccionar qual o ficheiro que desejas guardar como\nNota: Existem conf #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "" @@ -9455,6 +9494,11 @@ msgstr "" msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9686,6 +9730,20 @@ msgstr "Gráfico de Barras Empilhadas" msgid "Stacked Line Graph" msgstr "Gráfico de Linhas Empilhadas" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Padrão" @@ -10646,6 +10704,14 @@ msgstr "Para:" msgid "Toggle filters" msgstr "" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10765,8 +10831,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseGitIDiff: o visualizador de diferenças entre imagens para o TortoiseSVN\n\nOs parâmetros linha de comando disponíveis são:\n/left:\"caminho para a figura à esquerda\"\n/lefttitle:\"titulo para a figura à esquerda\"\n/right:\"caminho para a figura à direita.\"\n/righttitle:\"titulo para a figura à direita\"\n/overlay\t\tpara activar o modo de sobreposição\n/fit\t\tpara ajustar o tamanho das imagens\n/showinfo\t\tpara mostrar as caixas de informações das imagens" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10963,6 +11029,11 @@ msgstr "Impossível escrever para %1: ou só permite a leitura, ou está aberto msgid "Uncheck" msgstr "Desmarcar" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11036,6 +11107,16 @@ msgstr "Conflitos não resolvidos!" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Sem Título" @@ -11090,30 +11171,10 @@ msgstr "Usar por &omissão vista de um só painel para a comparação de dois ar msgid "Use &other text block" msgstr "Usar &outro bloco de texto" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Usar o 'meu' bloco de texto" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Usar o 'meu' bloco de texto e depois o 'deles'" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Usar o bloco de texto 'deles'" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Usar o bloco de texto 'deles' e depois o 'meu'" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11199,11 +11260,13 @@ msgstr "Usar bloco esquerdo" msgid "Use left file" msgstr "Usar o arquivo da esquerda" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11223,11 +11286,12 @@ msgstr "Usar expressão regular" msgid "Use right block" msgstr "Usar bloco direito" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11448,10 +11512,19 @@ msgstr "" msgid "View Bars" msgstr "" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11497,7 +11570,7 @@ msgid "Waiting for input" msgstr "" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11584,6 +11657,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11610,6 +11697,10 @@ msgstr "Alterações de espeços em branco (tabs, espaços)" msgid "Whitespaces" msgstr "Espaços em branco" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12039,6 +12130,10 @@ msgstr "" msgid "file/foldernames" msgstr "nomes de ficheiro/pasta" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "caminhos completos" @@ -12276,10 +12371,6 @@ msgstr "para %1" msgid "to %s" msgstr "para %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "semana" diff --git a/Languages/Tortoise_ro.po b/Languages/Tortoise_ro.po index 6bac74a67..09444e146 100644 --- a/Languages/Tortoise_ro.po +++ b/Languages/Tortoise_ro.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Romanian (http://www.transifex.com/lznuaa/tortoisegit/language/ro/)\n" "MIME-Version: 1.0\n" @@ -723,9 +723,10 @@ msgstr "&Font pentru mesajele din jurnal:" msgid "&Font:" msgstr "&Font:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "&Forţează" @@ -1239,6 +1240,10 @@ msgstr "&Buluceşte" msgid "&Squash ALL" msgstr "&Buluceşte TOT" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Porneşte" @@ -1343,6 +1348,10 @@ msgstr "Discuri nec&unoscute" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "S&us" @@ -1398,14 +1407,14 @@ msgstr "&Da" msgid "&add \"cherry picked from\"" msgstr "" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "&ignoră schimbarile de spaţiu" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "&modificari cunoscute" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(prestabilit TortoiseGit)" @@ -2918,6 +2927,10 @@ msgstr "Închide fereastră actuală şi solicită salvarea documentelor" msgid "Collapse" msgstr "Colaps" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4661,6 +4674,10 @@ msgstr "Executabil (+x)" msgid "Exit" msgstr "Ieşire" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Navighează la" @@ -5178,10 +5195,6 @@ msgstr "Forţează reamplasarea chiar dacă ramura curenta este un descendent al msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5264,6 +5277,10 @@ msgstr "" msgid "Full data" msgstr "" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "Cautare în tot textul" @@ -5574,6 +5591,14 @@ msgstr "Ascunde meniuri pentru căi fără versiune" msgid "Hide Patch<<" msgstr "Ascunde petic<<" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Ascunde scriptul în timpul rulării" @@ -6215,6 +6240,13 @@ msgstr "Valuta nu este valabilă." msgid "Invalid revision number!" msgstr "Numărul reviziei este invalid!" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6268,7 +6300,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "Păstrează" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "Păstrează listele de schimbări" @@ -6290,7 +6322,7 @@ msgstr "Coreeană" msgid "L" msgstr "" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7577,6 +7609,16 @@ msgstr "" msgid "Parent(s)" msgstr "Părinte (Părinţi)" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Parola" @@ -8535,7 +8577,8 @@ msgstr "Restaurează" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Restaurează implicitele" @@ -8689,11 +8732,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9089,8 +9127,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Selectaţi comportamentul dialogului de progres la sfârşitul operaţiei." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9126,7 +9164,8 @@ msgstr "Selecteaza ce fisier vrei sa salvezi\nNote: Exista conflicte nerezolvate #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "Selectează/deselecte&ază tot" @@ -9459,6 +9498,11 @@ msgstr "Afişează jurnal..." msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9690,6 +9734,20 @@ msgstr "Grafic cu bare suprapuse" msgid "Stacked Line Graph" msgstr "Grafic cu linii suprapuse" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Standard" @@ -10650,6 +10708,14 @@ msgstr "Până la:" msgid "Toggle filters" msgstr "Comută între filtre" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10769,8 +10835,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseGitIDiff: Vizualizatorul de diferenţiere de imagini pentru TortoiseGit\n\nParametrii disponibili la linia de comandă sunt:\n/left:\"calea imaginii din stânga\"\n/lefttitle:\"titlul afişat pentru imaginea din stânga\"\n/right:\"calea imaginii din dreapta\"\n/righttitle:\"titlul afişat pentru imaginea din dreapta\"\n/overlay\t\tpentru a activa modul de suprapunere\n/fit\t\tpentru a potrivi dimensiunile imaginilor\n/showinfo\t\tpentru a afişa căsuţe cu informaţia imaginilor" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10967,6 +11033,11 @@ msgstr "Nu s-a putut scrie la %1, este marcat pentru numai-citire sau este desch msgid "Uncheck" msgstr "Debifează" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11040,6 +11111,16 @@ msgstr "Conflicte nerezolvate!" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Fără titlu" @@ -11094,30 +11175,10 @@ msgstr "F&oloseşte un singur panou când se diferenţiază între două fişier msgid "Use &other text block" msgstr "Foloseşte &alt bloc de text" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Foloseşte blocul de text \"propriu\"" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Foloseşte întâi blocul \"propriu\" de text şi apoi \"al lor\"" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Foloseşte blocul de text \"al lor\"" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Foloseşte întâi blocul de text \"al lor\" şi apoi \"propriu\"" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "Foloseşte componenta de cale HTTP" @@ -11203,11 +11264,13 @@ msgstr "Foloseşte blocul din stânga" msgid "Use left file" msgstr "Foloseşte fişierul de pe stângă" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11227,11 +11290,12 @@ msgstr "Foloseşte expresie regulară" msgid "Use right block" msgstr "Folosește blocul din dreapta" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11452,10 +11516,19 @@ msgstr "Vedere .tgitconfig" msgid "View Bars" msgstr "" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "Vizualizează petic" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11501,7 +11574,7 @@ msgid "Waiting for input" msgstr "Se aşteaptă intrări" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11588,6 +11661,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11614,6 +11701,10 @@ msgstr "Schimbări de spații (tab-uri, spații)" msgid "Whitespaces" msgstr "Spaţii goale" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12043,6 +12134,10 @@ msgstr "" msgid "file/foldernames" msgstr "" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "" @@ -12280,10 +12375,6 @@ msgstr "în %1" msgid "to %s" msgstr "în %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "săptămână" diff --git a/Languages/Tortoise_ru.po b/Languages/Tortoise_ru.po index 12c1c5180..bc3c73736 100644 --- a/Languages/Tortoise_ru.po +++ b/Languages/Tortoise_ru.po @@ -1,12 +1,12 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # # Translators: # ad loud , 2017 # Alexander Shchekaturov , 2013-2016 -# Andrei Stepanov , 2014-2017 +# Andrei Stepanov, 2014-2017 # Arioch , 2012-2013 # Arkady Shapkin , 2011 # Arkady Shapkin , 2011 @@ -29,13 +29,13 @@ # 82f4f02557fd4886d250a2aa0aecb530_0f90749 <0cd40767d55b0248271195f29db18a8d_208365>, 2014 # Sergey Kuznetsov , 2021 # Alexander Shchekaturov , 2013 -# Stanislav Kroter , 2016-2021 +# Stanislav Kroter , 2016-2022 # Sven Strickroth , 2012-2013,2020-2021 # Дмитрий Сытьков , 2011 # Arioch , 2013 # Arioch , 2012 # Vladimir.Serykh , 2015 -# Антон Бауткин , 2018 +# Антон Бауткин , 2018,2021 # Виталий Переславцев , 2013 # Вячеслав Третьяков , 2012-2013 # Герман Борисов , 2017-2018 @@ -48,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: 2021-03-16 15:09+0000\n" +"PO-Revision-Date: 2022-01-21 10:59+0000\n" "Last-Translator: Stanislav Kroter \n" "Language-Team: Russian (http://www.transifex.com/lznuaa/tortoisegit/language/ru/)\n" "MIME-Version: 1.0\n" @@ -742,9 +742,10 @@ msgstr "&Шрифт журнала:" msgid "&Font:" msgstr "&Шрифт:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "&Принудительно" @@ -1258,6 +1259,10 @@ msgstr "&Объединить" msgid "&Squash ALL" msgstr "&Объединить ВСЕ" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Начать" @@ -1362,6 +1367,10 @@ msgstr "&Неизвестные носители" msgid "&Unlock" msgstr "&Разблокировать" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "&Вверх" @@ -1417,14 +1426,14 @@ msgstr "&Да" msgid "&add \"cherry picked from\"" msgstr "&добавить \"пересмотрено вручную из\"" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "&Игнорировать изменения пробелов" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "&известные изменения" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(по умолчанию в TortoiseGit)" @@ -2937,6 +2946,10 @@ msgstr "Закрывает активное окно и приглашает с msgid "Collapse" msgstr "Свернуть" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -3374,7 +3387,7 @@ msgid "" "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 "" +msgstr "Не получилось найти \"msysgit\" или \"windows\" в строке версий git.exe.\nЕсли вы используете git окружения Cygwin или MSYS2, то вам нужно задействовать специальные временные программные решения.\nБолее подробную информацию смотрите в справке по ключевому слову \"Cygwin Git\" или \"MSYS2 Git\"." #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) #, c-format @@ -3606,7 +3619,7 @@ msgstr "Создаю запрос-получение..." #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) msgid "Credential" -msgstr "" +msgstr "Полномочия" #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." @@ -4680,6 +4693,10 @@ msgstr "Выполняемый (+x)" msgid "Exit" msgstr "Выход" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Открыть в Проводнике" @@ -5197,10 +5214,6 @@ msgstr "Принудительно переместить, даже если т msgid "Force unlock" msgstr "Разблокировать принудительно" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "Принудительно: можно потерять изменения" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5219,14 +5232,14 @@ msgstr "Вперёд %d" msgid "" "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 "" +msgstr "Найдено \"msysgit\" или \"windows\" в строке версии git.exe, однако вы включили временные решения git.exe. Эти временные решения должны быть отключены для правильной работы с Git для 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 running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." -msgstr "" +msgstr "Обнаружен блокирующий файл, указывающий, что идёт процесс перебазирования TortoiseGit. Это блокирует эту операцию.\n\nЕсли вы не запускали процесс перебазирования TortoiseGit прямо сейчас, то вы можете удалить устаревший блокирующий файл, чтобы продолжить." #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) msgid "" @@ -5283,6 +5296,10 @@ msgstr "Полные данные фиксации без изменённых msgid "Full data" msgstr "Полные данные" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "Полная история" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "Полнотекстовый поиск" @@ -5593,6 +5610,14 @@ msgstr "Скрыть меню для неверсированных папок" msgid "Hide Patch<<" msgstr "Скрыть заплатку<<" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Скрыть скрипт во время работы" @@ -6234,6 +6259,13 @@ msgstr "Неправильное денежное значение." msgid "Invalid revision number!" msgstr "Неверный номер ревизии!" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "Файл настроек системы отслеживания ошибок" @@ -6287,7 +6319,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "Сохранить" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "Сохранить группы изменений" @@ -6309,13 +6341,13 @@ msgstr "Корейский" msgid "L" msgstr "L" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "LFS" #. Resource IDs: (IDS_PROGRS_TITLE_LFS_LOCK) msgid "LFS Lock" -msgstr "" +msgstr "Блокировка LFS" #. Resource IDs: (IDS_STATUSLIST_COLLFSLOCK) msgid "LFS Lock Owner" @@ -6323,11 +6355,11 @@ msgstr "" #. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 176) msgid "LFS Locks" -msgstr "" +msgstr "Блокировки LFS" #. Resource IDs: (IDS_PROGRS_TITLE_LFS_UNLOCK) msgid "LFS Unlock" -msgstr "" +msgstr "Разблокировка LFS" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 65535) msgid "LINE1" @@ -6568,7 +6600,7 @@ msgstr "Заблокировать" #. Resource IDs: (IDS_MENUDESCLFSLOCK) msgid "Locks a file using LFS" -msgstr "" +msgstr "Заблокировать файл, используя LFS" #. Resource IDs: (Dialog IDD_SETTINGSTBLAME: Control id 65535, IDS_LOG) msgid "Log" @@ -7511,7 +7543,7 @@ msgstr "Output.prn" #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) msgid "Overlay Handlers" -msgstr "" +msgstr "Обработчики наложений" #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" @@ -7596,6 +7628,16 @@ msgstr "Предок %2!s!" msgid "Parent(s)" msgstr "Предок(и)" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Пароль" @@ -8554,7 +8596,8 @@ msgstr "Восстановить" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Сбросить на исходные" @@ -8708,11 +8751,6 @@ msgstr "Запустить, когда рабочая копия находит msgid "S" msgstr "S" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "Показать изменённые файлы в рабочей копии" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "Пр&опустить невыбранное" @@ -8796,7 +8834,7 @@ msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) msgid "SafeCrLf:" -msgstr "" +msgstr "SafeCrLf:" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9108,8 +9146,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Выберите поведение окна выполнения по окончанию операции." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "Выбрать поведение диалога прогресса в конце операции." #. Resource IDs: (57642) msgid "" @@ -9145,7 +9183,8 @@ msgstr "Выберите файл, который вы хотите сохран #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "Выбрать/снять &все" @@ -9478,6 +9517,11 @@ msgstr "Показать журнал..." msgid "Show long format even if a tag is exactly on that commit" msgstr "Показывать длинный формат даже если метка стоит именно на этой фиксации" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "Показать изменённые файлы в &рабочей копии" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9709,6 +9753,20 @@ msgstr "Гистограмма стопкой" msgid "Stacked Line Graph" msgstr "График стопкой" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Стандартные" @@ -10669,6 +10727,14 @@ msgstr "По:" msgid "Toggle filters" msgstr "Переключить фильтры" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "Слишком много файлов, чтобы отобразить." + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10788,8 +10854,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseIDiff: программа для просмотра различий в изображениях для TortoiseSVN\n\nДоступные параметры командной строки:\n/left:\"путь до левой картинки\"\n/lefttitle:\"заголовок для левой картинки\"\n/right:\"путь до правой картинки\"\n/righttitle:\"заголовок для правой картинки\"\n/overlay\t\tдля включения режима наложения\n/fit\t\tдля подгона размеров изображений\n/showinfo\t\tдля показа окон информации об изображениях" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10986,6 +11052,11 @@ msgstr "Невозможно записать в %1: он только-для-ч msgid "Uncheck" msgstr "Снять" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11059,6 +11130,16 @@ msgstr "Неулаженные конфликты!" msgid "Unset tracked branch" msgstr "Отозвать отслеживаемую ветвь" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Неназванный" @@ -11113,30 +11194,10 @@ msgstr "&Однопанельный вид по умолчанию для дву msgid "Use &other text block" msgstr "Использовать &другой текстовый блок" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Использовать 'мой' текстовый блок" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Использовать 'мой' текстовый блок затем 'их'" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Использовать 'их' текстовый блок" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Использовать 'их' текстовый блок затем 'мой'" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "Использовать .mailmap" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "Использовать компонент пути HTTP" @@ -11222,11 +11283,13 @@ msgstr "Использовать левый блок" msgid "Use left file" msgstr "Использовать левый файл" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "Использовать левый текстовый блок" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "Использовать левый текстовый блок перед правым" @@ -11246,11 +11309,12 @@ msgstr "Регулярное выражение" msgid "Use right block" msgstr "Использовать правый блок" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "Использовать правый текстовый блок" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "Использовать правый текстовый блок перед левым" @@ -11471,10 +11535,19 @@ msgstr "Просмотреть .tgitconfig" msgid "View Bars" msgstr "Отображать Полосы" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "Посмотреть заплатку" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11520,8 +11593,8 @@ msgid "Waiting for input" msgstr "Ожидаю ввода" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" -msgstr "Поведение" +msgid "Walk Be&havior" +msgstr "" #. Resource IDs: (IDS_WARN_WARNING) msgid "Warning" @@ -11607,6 +11680,20 @@ msgstr "При вводе URL, если вы не указали внешнее msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "Ссылаться ли только на аннотированные метки, все метки или все ссылки" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11633,6 +11720,10 @@ msgstr "Изменения непечатаемых знаков (символы msgid "Whitespaces" msgstr "Непечатаемые знаки" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "Контекстное меню Windows 11" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12062,6 +12153,10 @@ msgstr "файл, не подмодуль" msgid "file/foldernames" msgstr "имена файлов/каталогов" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "полные пути" @@ -12299,10 +12394,6 @@ msgstr "до %1" msgid "to %s" msgstr "в %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "н&еизвестные изменения" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "неделя" diff --git a/Languages/Tortoise_sk.po b/Languages/Tortoise_sk.po index 1f3ef4762..1e98ba63d 100644 --- a/Languages/Tortoise_sk.po +++ b/Languages/Tortoise_sk.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Slovak (http://www.transifex.com/lznuaa/tortoisegit/language/sk/)\n" "MIME-Version: 1.0\n" @@ -708,9 +708,10 @@ msgstr "&Písmo správ denníka:" msgid "&Font:" msgstr "&Písmo:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "&Vynútiť" @@ -1224,6 +1225,10 @@ msgstr "" msgid "&Squash ALL" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Začať" @@ -1328,6 +1333,10 @@ msgstr "&Neznáme disky" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "&Hore" @@ -1383,14 +1392,14 @@ msgstr "&Áno" msgid "&add \"cherry picked from\"" msgstr "" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "&Ignorovať zmeny medzier" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "&známe zmeny" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "" @@ -2903,6 +2912,10 @@ msgstr "Zatvorí aktívne okno a vyzve k uloženiu dokumentov" msgid "Collapse" msgstr "Zbaliť" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4646,6 +4659,10 @@ msgstr "Spustiteľné (+x)" msgid "Exit" msgstr "Ukončiť" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Preskúmať do" @@ -5163,10 +5180,6 @@ msgstr "" msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5249,6 +5262,10 @@ msgstr "" msgid "Full data" msgstr "" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "" @@ -5559,6 +5576,14 @@ msgstr "Skryť ponuku pre neverziované cesty" msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Skryť skript počas behu" @@ -6200,6 +6225,13 @@ msgstr "Chybná mena." msgid "Invalid revision number!" msgstr "Neplatné číslo revízie!" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6253,7 +6285,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "Ponechať" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "" @@ -6275,7 +6307,7 @@ msgstr "Kórejske" msgid "L" msgstr "" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7562,6 +7594,16 @@ msgstr "" msgid "Parent(s)" msgstr "Rodič(ia)" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Heslo" @@ -8520,7 +8562,8 @@ msgstr "Obnoviť" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Obnoviť základné" @@ -8674,11 +8717,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9074,8 +9112,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Vyberte správanie pre dialógové okno postupu na konci úkonu." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9111,7 +9149,8 @@ msgstr "Vyberte ktorý súbor chcete uložiť ako\nPoznámka: Niektoré konfklit #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "" @@ -9444,6 +9483,11 @@ msgstr "" msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9675,6 +9719,20 @@ msgstr "Kumulovaný graf" msgid "Stacked Line Graph" msgstr "Zásobníkový čiarový graf" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Štandard" @@ -10635,6 +10693,14 @@ msgstr "Do:" msgid "Toggle filters" msgstr "Ponechať filtre" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10754,8 +10820,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10952,6 +11018,11 @@ msgstr "Nemožno zapísať do %1, je len na čítanie, alebo otvorený niekym in msgid "Uncheck" msgstr "Odznačiť" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11025,6 +11096,16 @@ msgstr "Nevyriešené konflikty!" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Nepomenované" @@ -11079,30 +11160,10 @@ msgstr "Predvoliť &jedno-panelové zobrazenie pre dvojsúborové porovnanie" msgid "Use &other text block" msgstr "Použiť iný bl&ok textu" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Použiť blok \"Moje\"" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Použiť blok \"Moje\" potom \"Ich\"" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Použiť blok \"Ich\"" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Použiť blok \"Ich\" potom \"Moje\"" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11188,11 +11249,13 @@ msgstr "Použiť ľavý blok" msgid "Use left file" msgstr "Použiť" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11212,11 +11275,12 @@ msgstr "Použiť regulárny výraz" msgid "Use right block" msgstr "Použiť blok z prava" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11437,10 +11501,19 @@ msgstr "Zobraziť .tgitconfig" msgid "View Bars" msgstr "" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11486,7 +11559,7 @@ msgid "Waiting for input" msgstr "" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11573,6 +11646,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11599,6 +11686,10 @@ msgstr "Biele znaky (tabulátory, medzery)" msgid "Whitespaces" msgstr "Biele znaky" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12028,6 +12119,10 @@ msgstr "" msgid "file/foldernames" msgstr "Mená súborov/adresárov" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "úplné cesty" @@ -12265,10 +12360,6 @@ msgstr "do %1" msgid "to %s" msgstr "do %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "týždňov" diff --git a/Languages/Tortoise_sl.po b/Languages/Tortoise_sl.po index 8763100fa..24792237a 100644 --- a/Languages/Tortoise_sl.po +++ b/Languages/Tortoise_sl.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -10,7 +10,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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Slovenian (http://www.transifex.com/lznuaa/tortoisegit/language/sl/)\n" "MIME-Version: 1.0\n" @@ -704,9 +704,10 @@ msgstr "&Pisava za dnevniške zapise:" msgid "&Font:" msgstr "&Pisava:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "" @@ -1220,6 +1221,10 @@ msgstr "" msgid "&Squash ALL" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "" @@ -1324,6 +1329,10 @@ msgstr "&Neznani pogoni" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "" @@ -1379,12 +1388,12 @@ msgstr "" msgid "&add \"cherry picked from\"" msgstr "" -#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) -msgid "&ignore space change" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" +#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) +msgid "&ignore space change" msgstr "" #. Resource IDs: (IDS_TORTOISEGITDEFAULT) @@ -2899,6 +2908,10 @@ msgstr "Zapre aktivno okno in ponudi shranjevanje dokumentov" msgid "Collapse" msgstr "" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4642,6 +4655,10 @@ msgstr "" msgid "Exit" msgstr "Izhod" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Pokaži v Raziskovalcu" @@ -5159,10 +5176,6 @@ msgstr "" msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5245,6 +5258,10 @@ msgstr "" msgid "Full data" msgstr "" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "" @@ -5555,6 +5572,14 @@ msgstr "Skrij menije za neverzionirane poti" msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Med izvajanjem skrij ukazno datoteko" @@ -6196,6 +6221,13 @@ msgstr "Napačna valuta." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6249,7 +6281,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "" @@ -6271,7 +6303,7 @@ msgstr "" msgid "L" msgstr "" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7558,6 +7590,16 @@ msgstr "" msgid "Parent(s)" msgstr "" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "" @@ -8516,7 +8558,8 @@ msgstr "" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Obnovi privzeto" @@ -8670,11 +8713,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9070,8 +9108,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Izberite vedenje pogovornega okna napredka na koncu operacije." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9107,7 +9145,8 @@ msgstr "" #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "" @@ -9440,6 +9479,11 @@ msgstr "" msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9671,6 +9715,20 @@ msgstr "Zložen stolpični graf" msgid "Stacked Line Graph" msgstr "Zložen črtni graf" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "" @@ -10631,6 +10689,14 @@ msgstr "Do:" msgid "Toggle filters" msgstr "" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10750,8 +10816,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10948,6 +11014,11 @@ msgstr "Pisanje v %1 ni možno; datoteka je namenjena le branju ali pa je že od msgid "Uncheck" msgstr "Izključi" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11021,6 +11092,16 @@ msgstr "Nerešeni spori!" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Brez naslova" @@ -11075,30 +11156,10 @@ msgstr "Pri pregledu razlik dveh datotek je privzet &enodelni pogled" msgid "Use &other text block" msgstr "Uporabi &drug del besedila" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11184,11 +11245,13 @@ msgstr "" msgid "Use left file" msgstr "Uporabi levo datoteko" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11208,11 +11271,12 @@ msgstr "Uporabi regularni izraz" msgid "Use right block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11433,10 +11497,19 @@ msgstr "" msgid "View Bars" msgstr "" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11482,7 +11555,7 @@ msgid "Waiting for input" msgstr "" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11569,6 +11642,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11595,6 +11682,10 @@ msgstr "" msgid "Whitespaces" msgstr "Presledki" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12024,6 +12115,10 @@ msgstr "" msgid "file/foldernames" msgstr "" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "" @@ -12261,10 +12356,6 @@ msgstr "v %1" msgid "to %s" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "teden" diff --git a/Languages/Tortoise_sq.po b/Languages/Tortoise_sq.po index 6e4e5e46d..b26f8cf29 100644 --- a/Languages/Tortoise_sq.po +++ b/Languages/Tortoise_sq.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Albanian (http://www.transifex.com/lznuaa/tortoisegit/language/sq/)\n" "MIME-Version: 1.0\n" @@ -708,9 +708,10 @@ msgstr "&Font për shenime mesazhesh:" msgid "&Font:" msgstr "&Shkronja:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "" @@ -1224,6 +1225,10 @@ msgstr "" msgid "&Squash ALL" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "" @@ -1328,6 +1333,10 @@ msgstr "&Drejtues panjohur" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "" @@ -1383,12 +1392,12 @@ msgstr "" msgid "&add \"cherry picked from\"" msgstr "" -#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) -msgid "&ignore space change" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" +#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) +msgid "&ignore space change" msgstr "" #. Resource IDs: (IDS_TORTOISEGITDEFAULT) @@ -2903,6 +2912,10 @@ msgstr "" msgid "Collapse" msgstr "" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4646,6 +4659,10 @@ msgstr "" msgid "Exit" msgstr "Dalja" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "" @@ -5163,10 +5180,6 @@ msgstr "" msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5249,6 +5262,10 @@ msgstr "" msgid "Full data" msgstr "" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "" @@ -5559,6 +5576,14 @@ msgstr "" msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "" @@ -6200,6 +6225,13 @@ msgstr "Valutë e pavlerë. " msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6253,7 +6285,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "" @@ -6275,7 +6307,7 @@ msgstr "" msgid "L" msgstr "" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7562,6 +7594,16 @@ msgstr "" msgid "Parent(s)" msgstr "" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Password" @@ -8520,7 +8562,8 @@ msgstr "Rikthe" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "" @@ -8674,11 +8717,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9074,7 +9112,7 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." +"Select the behavior of the progress dialog at the end of the operation." msgstr "" #. Resource IDs: (57642) @@ -9111,7 +9149,8 @@ msgstr "" #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "" @@ -9444,6 +9483,11 @@ msgstr "" msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9675,6 +9719,20 @@ msgstr "" msgid "Stacked Line Graph" msgstr "" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Standarde" @@ -10635,6 +10693,14 @@ msgstr "Tek:" msgid "Toggle filters" msgstr "" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10754,8 +10820,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10952,6 +11018,11 @@ msgstr "" msgid "Uncheck" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11025,6 +11096,16 @@ msgstr "" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Paemëruar" @@ -11079,30 +11160,10 @@ msgstr "" msgid "Use &other text block" msgstr "" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11188,11 +11249,13 @@ msgstr "" msgid "Use left file" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11212,11 +11275,12 @@ msgstr "" msgid "Use right block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11437,10 +11501,19 @@ msgstr "Shiko .tgitconfig" msgid "View Bars" msgstr "" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "Shiko Patch" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11486,7 +11559,7 @@ msgid "Waiting for input" msgstr "" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11573,6 +11646,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11599,6 +11686,10 @@ msgstr "" msgid "Whitespaces" msgstr "" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12028,6 +12119,10 @@ msgstr "" msgid "file/foldernames" msgstr "" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "" @@ -12265,10 +12360,6 @@ msgstr "" msgid "to %s" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "java" diff --git a/Languages/Tortoise_sr@Cyrl.po b/Languages/Tortoise_sr@Cyrl.po index a494b150c..9268a0ed6 100644 --- a/Languages/Tortoise_sr@Cyrl.po +++ b/Languages/Tortoise_sr@Cyrl.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+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" @@ -707,9 +707,10 @@ msgstr "&Фонт за поруке дневника:" msgid "&Font:" msgstr "&Фонт:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "" @@ -1223,6 +1224,10 @@ msgstr "" msgid "&Squash ALL" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "" @@ -1327,6 +1332,10 @@ msgstr "&Непознати дискови" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "" @@ -1382,12 +1391,12 @@ msgstr "" msgid "&add \"cherry picked from\"" msgstr "" -#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) -msgid "&ignore space change" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" +#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) +msgid "&ignore space change" msgstr "" #. Resource IDs: (IDS_TORTOISEGITDEFAULT) @@ -2902,6 +2911,10 @@ msgstr "Затвара активни прозор и упозорава на с msgid "Collapse" msgstr "Колапс" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4645,6 +4658,10 @@ msgstr "" msgid "Exit" msgstr "Излаз" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Истражи до" @@ -5162,10 +5179,6 @@ msgstr "" msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5248,6 +5261,10 @@ msgstr "" msgid "Full data" msgstr "Потпун податак" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "" @@ -5558,6 +5575,14 @@ msgstr "Крије меније за неверзионисане путање" msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Сакри скрипт док се извршава" @@ -6199,6 +6224,13 @@ msgstr "Неисправна валута." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6252,7 +6284,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "" @@ -6274,7 +6306,7 @@ msgstr "" msgid "L" msgstr "" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7561,6 +7593,16 @@ msgstr "" msgid "Parent(s)" msgstr "" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Лозинка" @@ -8519,7 +8561,8 @@ msgstr "Вратити" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Врати почетне поставке" @@ -8673,11 +8716,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9073,8 +9111,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Изаберите понашање дијалога за приказ напретка на крају операције." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9110,7 +9148,8 @@ msgstr "Изаберите који фајл желте да сачувате к #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "" @@ -9443,6 +9482,11 @@ msgstr "" msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9674,6 +9718,20 @@ msgstr "Наслагани стубасти дијаграм" msgid "Stacked Line Graph" msgstr "Наслагани линијски дијаграм" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "" @@ -10634,6 +10692,14 @@ msgstr "Према:" msgid "Toggle filters" msgstr "" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10753,8 +10819,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10951,6 +11017,11 @@ msgstr "Нисам у могућности записивати у %1, могу msgid "Uncheck" msgstr "Склони ознаку" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11024,6 +11095,16 @@ msgstr "Нерешен саџај!" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Без наслова" @@ -11078,30 +11159,10 @@ msgstr "Користи &један-панел преглед као уобича msgid "Use &other text block" msgstr "Користи &други блок текста" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Користи 'мој' текст бокс" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Користи 'мој' текст бокс затим 'њихов ' " - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Користи 'њихов' текст бокс" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Користи 'њихов' текст бокс затим 'мој ' " - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11187,11 +11248,13 @@ msgstr "Користи леви блок" msgid "Use left file" msgstr "Користи преостали фајл" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11211,11 +11274,12 @@ msgstr "Користи регуларне изразе" msgid "Use right block" msgstr "Користи десни блок" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11436,10 +11500,19 @@ msgstr "" msgid "View Bars" msgstr "Панел прегледа" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11485,7 +11558,7 @@ msgid "Waiting for input" msgstr "" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11572,6 +11645,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11598,6 +11685,10 @@ msgstr "Белине су измењене (табови, размаци)" msgid "Whitespaces" msgstr "Белине" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12027,6 +12118,10 @@ msgstr "" msgid "file/foldernames" msgstr "фајл/фолдер имена" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "пуна путања" @@ -12264,10 +12359,6 @@ msgstr "ка %1" msgid "to %s" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "недеља" diff --git a/Languages/Tortoise_sr@latin.po b/Languages/Tortoise_sr@latin.po index 54c57dfb4..03ed2a5ee 100644 --- a/Languages/Tortoise_sr@latin.po +++ b/Languages/Tortoise_sr@latin.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+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" @@ -713,9 +713,10 @@ msgstr "&Font za log poruke" msgid "&Font:" msgstr "&Font:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "" @@ -1229,6 +1230,10 @@ msgstr "&Sabij" msgid "&Squash ALL" msgstr "&Sabij SVE" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Započni" @@ -1333,6 +1338,10 @@ msgstr "&Nepoznati diskovi" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "&Naviše" @@ -1388,14 +1397,14 @@ msgstr "&Da" msgid "&add \"cherry picked from\"" msgstr "&dodaj komentar \"cherry picked from\"" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "&ignoriši izmene blanko znakova" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "&poznate izmene" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(TortoiseGit podrazumevano)" @@ -2908,6 +2917,10 @@ msgstr "Zatvara aktivni prozor i upozorava na snimanje dokumenata" msgid "Collapse" msgstr "Kolaps" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4651,6 +4664,10 @@ msgstr "" msgid "Exit" msgstr "Izlaz" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Istraži do" @@ -5168,10 +5185,6 @@ msgstr "" msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5254,6 +5267,10 @@ msgstr "" msgid "Full data" msgstr "Potpun podatak" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "" @@ -5564,6 +5581,14 @@ msgstr "Krije menije za neverzionisane putanje" msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Sakri skript dok se izvršava" @@ -6205,6 +6230,13 @@ msgstr "Neispravna valuta." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6258,7 +6290,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "Sačuvaj liste promena" @@ -6280,7 +6312,7 @@ msgstr "" msgid "L" msgstr "" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7567,6 +7599,16 @@ msgstr "" msgid "Parent(s)" msgstr "" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Lozinka" @@ -8525,7 +8567,8 @@ msgstr "Vratiti" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Vrati početne postavke" @@ -8679,11 +8722,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9079,8 +9117,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Izaberite ponašanje dijaloga za prikaz napretka na kraju operacije." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9116,7 +9154,8 @@ msgstr "Izaberite koji fajl želte da sačuvate kao\nPrimedba: Postoji nerešen #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "" @@ -9449,6 +9488,11 @@ msgstr "" msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9680,6 +9724,20 @@ msgstr "Naslagani stubasti dijagram" msgid "Stacked Line Graph" msgstr "Naslagani linijski dijagram" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Standard" @@ -10640,6 +10698,14 @@ msgstr "Prema:" msgid "Toggle filters" msgstr "" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10759,8 +10825,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10957,6 +11023,11 @@ msgstr "Nisam u mogućnosti zapisivati u %1, moguće je samo čitati ili to neko msgid "Uncheck" msgstr "Skloni oznaku" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11030,6 +11101,16 @@ msgstr "Nerešen sadžaj!" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Bez naslova" @@ -11084,30 +11165,10 @@ msgstr "Koristi &jedan-panel pregled kao uobičajeni za pregled razlika 2 fajla" msgid "Use &other text block" msgstr "Koristi &drugi blok teksta" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Koristi 'moj' tekst boks" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Koristi 'moj' tekst boks zatim 'njihov ' " - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Koristi 'njihov' tekst boks" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Koristi 'njihov' tekst boks zatim 'moj ' " - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11193,11 +11254,13 @@ msgstr "Koristi levi blok" msgid "Use left file" msgstr "Koristi preostali fajl" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11217,11 +11280,12 @@ msgstr "Koristi regularne izraze" msgid "Use right block" msgstr "Koristi desni blok" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11442,10 +11506,19 @@ msgstr "" msgid "View Bars" msgstr "Panel pregleda" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11491,7 +11564,7 @@ msgid "Waiting for input" msgstr "" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11578,6 +11651,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11604,6 +11691,10 @@ msgstr "Beline su izmenjene (tabovi, razmaci)" msgid "Whitespaces" msgstr "Beline" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12033,6 +12124,10 @@ msgstr "" msgid "file/foldernames" msgstr "fajl/folder imena" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "puna putanja" @@ -12270,10 +12365,6 @@ msgstr "ka %1" msgid "to %s" msgstr "ka %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "nedelja" diff --git a/Languages/Tortoise_sv.po b/Languages/Tortoise_sv.po index b1291b67a..25f03613c 100644 --- a/Languages/Tortoise_sv.po +++ b/Languages/Tortoise_sv.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -11,7 +11,7 @@ # LordDaimos , 2011 # Kim Svensson , 2011 # Kim Svensson , 2011 -# Kristoffer Malmström , 2016 +# 3a10d72403233f483718c552de58fc40_a94374c , 2016 # LordDaimos , 2011 # Magnus Österlund, 2013 # Pär , 2013 @@ -19,14 +19,14 @@ # , 2011 # xt00r , 2012 # Stig Nordlander , 2013 -# Sven Strickroth , 2013,2015,2020 +# Sven Strickroth , 2013,2015,2020-2021 # xt00r , 2012 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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Swedish (http://www.transifex.com/lznuaa/tortoisegit/language/sv/)\n" "MIME-Version: 1.0\n" @@ -720,9 +720,10 @@ msgstr "&Font för loggmeddelanden:" msgid "&Font:" msgstr "&Font:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "&Tvinga" @@ -744,7 +745,7 @@ msgstr "" #. Resource IDs: (65535 - PopupMenu) msgid "&Git" -msgstr "" +msgstr "&Git" #. Resource IDs: (Dialog IDD_SVNDCOMMITTYPE: Control id 2153) msgid "&Git Style Commit (--rmdir)" @@ -1236,6 +1237,10 @@ msgstr "&Squasha" msgid "&Squash ALL" msgstr "&Squasha ALLA" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Starta" @@ -1340,6 +1345,10 @@ msgstr "&Okända enheter" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "&Upp" @@ -1395,14 +1404,14 @@ msgstr "&Ja" msgid "&add \"cherry picked from\"" msgstr "&lägg till \"cherry picked från\"" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "&Ignorera ändrat tomrum" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "&kända ändringar" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(TortoiseGit standard)" @@ -2129,7 +2138,7 @@ msgstr "Automatisk CrLf konvertering" #. 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" @@ -2155,7 +2164,7 @@ msgstr "Automatisk ifyllning föreslår ord (vanligtvis klass- eller medlemsnamn #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) msgid "AutoCrLf:" -msgstr "" +msgstr "AutoCrLf:" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" @@ -2915,6 +2924,10 @@ msgstr "Stäng aktivt fönster och fråga om spara dokument" msgid "Collapse" msgstr "Fäll ihop" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -2933,15 +2946,15 @@ msgstr "Färger" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) msgid "Colors 1" -msgstr "" +msgstr "Färger 1" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) msgid "Colors 2" -msgstr "" +msgstr "Färger 2" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) msgid "Colors 3" -msgstr "" +msgstr "Färger 3" #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format @@ -3221,11 +3234,11 @@ msgstr "Konflikter: %d" #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) msgid "Context Menu" -msgstr "" +msgstr "Snabbmeny" #. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) msgid "Context Menu 2" -msgstr "" +msgstr "Snabbmeny 2" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" @@ -3584,7 +3597,7 @@ msgstr "Skapar Pull-begäran" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) msgid "Credential" -msgstr "" +msgstr "Inloggningshanterare" #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." @@ -3906,15 +3919,15 @@ msgstr "Dialoger" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) msgid "Dialogs 1" -msgstr "" +msgstr "Dialoger 1" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) msgid "Dialogs 2" -msgstr "" +msgstr "Dialoger 2" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) msgid "Dialogs 3" -msgstr "" +msgstr "Dialoger 3" #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" @@ -4658,6 +4671,10 @@ msgstr "Exekverbar (+x)" msgid "Exit" msgstr "Avsluta" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Utforska till" @@ -5175,10 +5192,6 @@ msgstr "Tvinga en ombasering (rebase) även om nuvarande gren är en ättling ti msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "Tvinga: Kan överge" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5261,6 +5274,10 @@ msgstr "" msgid "Full data" msgstr "All information" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "Fullständig textsökning" @@ -5571,6 +5588,14 @@ msgstr "Dölj menyer för icke versionshanterade sökvägar" msgid "Hide Patch<<" msgstr "Göm Patch<<" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Dölj skriptet medans det körs" @@ -6212,13 +6237,20 @@ msgstr "Ogiltig valuta. " msgid "Invalid revision number!" msgstr "Ogiltigt revisionsnummer!" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" -msgstr "" +msgstr "Konfiguration av ärendespårning" #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) msgid "Issue Tracker Integration" -msgstr "" +msgstr "Ärendespårningsintegration" #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" @@ -6265,7 +6297,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "Behåll" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "Behåll ändringslistor" @@ -6287,7 +6319,7 @@ msgstr "Koreanska" msgid "L" msgstr "L" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7574,6 +7606,16 @@ msgstr "" msgid "Parent(s)" msgstr "Föräld(er/rar)" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Lösenord" @@ -8532,7 +8574,8 @@ msgstr "Återställ" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Återställ till standard" @@ -8686,11 +8729,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -8774,7 +8812,7 @@ msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) msgid "SafeCrLf:" -msgstr "" +msgstr "SafeCrLf:" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9086,8 +9124,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Välj dialogrutans beteende efter avklarad operation." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9123,7 +9161,8 @@ msgstr "Välj vilken fil du vill spara som\nNotera: Det finns olösta konflikter #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "Markera/Avmarkera &alla" @@ -9456,6 +9495,11 @@ msgstr "Visa historik..." msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9687,6 +9731,20 @@ msgstr "Staplat stapeldiagram" msgid "Stacked Line Graph" msgstr "Staplat linjediagram" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Standard" @@ -10647,6 +10705,14 @@ msgstr "Till:" msgid "Toggle filters" msgstr "Växla filter" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10742,7 +10808,7 @@ msgid "" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "" +msgstr "TortoiseGitBlame\n\nTortoiseGitBlame\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10766,8 +10832,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseGitIDiff: visar skillnader mellan bilder för TortoiseSVN\n\nFöljande kommandoradsparametrar är tillgängliga:\n/left:\"sökväg till den vänstra bilden\"\n/lefttitle:\"titel för den vänstra bilden\"\n/right:\"sökväg till den högra bilden\"\n/righttitle:\"titel för den högra bilden\"\n/overlay\t\tslår på överlagrinsläget\n/fit\t\tanpassa bildstorlekarna\n/showinfo\t\tvisa bildinformation" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10964,6 +11030,11 @@ msgstr "Kan inte skriva till %1, filen är markerad för endast läsning eller msgid "Uncheck" msgstr "Avmarkera" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11037,6 +11108,16 @@ msgstr "Olöst konflikt!" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Namnlös" @@ -11091,30 +11172,10 @@ msgstr "Använd &enkel vy som standard för 2-fils skillnader." msgid "Use &other text block" msgstr "Använd det &andra textblocket" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Använd \"mitt\" textblock" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Använd först \"mitt\" textblock och sedan \"deras\"" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Använd \"deras\" textblock" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Använd först \"deras\" textblock och sedan \"mitt\"" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "Använd HTTP sökvägskomponent" @@ -11200,11 +11261,13 @@ msgstr "Använd vänster block" msgid "Use left file" msgstr "Använd den vänstra filen" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11224,11 +11287,12 @@ msgstr "Använd reguljära uttryck" msgid "Use right block" msgstr "Använd höger block" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11449,10 +11513,19 @@ msgstr "Visa .tgitconfig" msgid "View Bars" msgstr "" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "Visa Patch" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11498,8 +11571,8 @@ msgid "Waiting for input" msgstr "Väntar på inmatning" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" -msgstr "Listalternativ" +msgid "Walk Be&havior" +msgstr "" #. Resource IDs: (IDS_WARN_WARNING) msgid "Warning" @@ -11585,6 +11658,20 @@ msgstr "När du skriver in en URL så kommer fjärrnamnet automatiskt att sätta msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11611,6 +11698,10 @@ msgstr "Tomrumsändringar (tabbar, mellanslag)" msgid "Whitespaces" msgstr "Tomrum" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12040,6 +12131,10 @@ msgstr "" msgid "file/foldernames" msgstr "fil/mappnamn" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "fulla sökvägar" @@ -12051,7 +12146,7 @@ msgstr "git avslutades inte korrekt (kod %d)" #. Resource IDs: (IDS_GITEXEFILEFILTER) msgid "git.exe|git.exe||" -msgstr "" +msgstr "git.exe|git.exe||" #. Resource IDs: (IDS_STATUSIGNORED) msgid "ignored" @@ -12109,27 +12204,27 @@ msgstr "rader: %d(+) %d(-) filer: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s = % #. Resource IDs: (IDS_SYSTEM_GCM) msgid "manager - all Windows users" -msgstr "" +msgstr "manager - alla Windows användare" #. Resource IDs: (IDS_GLOBAL_GCM) msgid "manager - current Windows user" -msgstr "" +msgstr "manager - nuvarande Windows användare" #. Resource IDs: (IDS_LOCAL_GCM) msgid "manager - this repository only" -msgstr "" +msgstr "manager - endast detta arkiv" #. Resource IDs: (IDS_SYSTEM_GCMCORE) msgid "manager-core - all Windows users" -msgstr "" +msgstr "manager-core - alla Windows användare" #. Resource IDs: (IDS_GLOBAL_GCMCORE) msgid "manager-core - current Windows user" -msgstr "" +msgstr "manager-core - nuvarande Windows användare" #. Resource IDs: (IDS_LOCAL_GCMCORE) msgid "manager-core - this repository only" -msgstr "" +msgstr "manager-core - endast detta arkiv" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1494) msgid "master" @@ -12277,10 +12372,6 @@ msgstr "till %1" msgid "to %s" msgstr "till %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "okä&nda ändringar" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "vecka" diff --git a/Languages/Tortoise_tr.po b/Languages/Tortoise_tr.po index a5bd9383a..ad427a5b0 100644 --- a/Languages/Tortoise_tr.po +++ b/Languages/Tortoise_tr.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -38,7 +38,7 @@ # Ozan Tunca , 2013 # Ozan Tunca , 2013,2017 # Ozgur Ozcitak , 2020 -# Sven Strickroth , 2012-2013,2020 +# Sven Strickroth , 2012-2013,2020-2021 # Tahir , 2013 # Tahir , 2013 # Vural Göze , 2011,2016 @@ -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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Turkish (http://www.transifex.com/lznuaa/tortoisegit/language/tr/)\n" "MIME-Version: 1.0\n" @@ -224,7 +224,7 @@ msgstr "" #. Resource IDs: (IDS_PROGRS_FINALINFO) #, c-format msgid "%1!s! in %2!s!" -msgstr "" +msgstr "%1!s! içinde %2!s!" #. Resource IDs: (IDS_GITVER_REQUIRED) #, c-format @@ -743,9 +743,10 @@ msgstr "&Günlük mesajları yazı tipi:" msgid "&Font:" msgstr "&Yazı tipi:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "&Zorla" @@ -1259,6 +1260,10 @@ msgstr "&Bastır" msgid "&Squash ALL" msgstr "&TÜMÜNÜ Bastır" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Başla" @@ -1363,6 +1368,10 @@ msgstr "&Bilinmeyen sürücüler" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "&Yukarı" @@ -1418,14 +1427,14 @@ msgstr "&Evet" msgid "&add \"cherry picked from\"" msgstr "" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "&boşluk değişikliğini yoksay" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "&bilinen değişiklikler" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(TortoiseGit varsayılanı)" @@ -1540,11 +1549,11 @@ msgstr "" #. Resource IDs: (IDS_PROC_LOG_BASIC_REFS) msgid "" -msgstr "" +msgstr "" #. Resource IDs: (IDS_PROC_LOG_LOCAL_BRANCHES) msgid "" -msgstr "" +msgstr "" #. Resource IDs: (IDS_PROC_LOG_NOBRANCH) msgid "" @@ -2152,7 +2161,7 @@ msgstr "Kendiliğinden CrLf dönüşümü" #. 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" @@ -2178,7 +2187,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) msgid "AutoCrLf:" -msgstr "" +msgstr "AutoCrLf:" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" @@ -2938,6 +2947,10 @@ msgstr "Aktif pencereyi kapatır ve dökümanları kayıt etmeniz gerektiğini s msgid "Collapse" msgstr "Gizle" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -2956,15 +2969,15 @@ msgstr "Renk" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) msgid "Colors 1" -msgstr "" +msgstr "Renk 1" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) msgid "Colors 2" -msgstr "" +msgstr "Renk 2" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) msgid "Colors 3" -msgstr "" +msgstr "Renk 3" #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format @@ -3244,11 +3257,11 @@ msgstr "Çakışmalar: %d" #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) msgid "Context Menu" -msgstr "" +msgstr "İçerik Menüsü" #. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) msgid "Context Menu 2" -msgstr "" +msgstr "İçerik Menüsü 2" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" @@ -3929,15 +3942,15 @@ msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) msgid "Dialogs 1" -msgstr "" +msgstr "Diyalog Ayarları 1" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) msgid "Dialogs 2" -msgstr "" +msgstr "Diyalog Ayarları 2" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) msgid "Dialogs 3" -msgstr "" +msgstr "Diyalog Ayarları 3" #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" @@ -4681,6 +4694,10 @@ msgstr "" msgid "Exit" msgstr "Çıkış" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "İncele" @@ -5198,10 +5215,6 @@ msgstr "" msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5284,6 +5297,10 @@ msgstr "" msgid "Full data" msgstr "Tam veri" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "Metin arama" @@ -5298,7 +5315,7 @@ msgstr "G" #. Resource IDs: (IDS_VIEW_SHOWGRAVATAR) msgid "G&ravatar" -msgstr "" +msgstr "G&ravatar" #. Resource IDs: (5061 - Menu) msgid "GB2312 (Simplified)" @@ -5594,6 +5611,14 @@ msgstr "Versiyonlanmamış dizinler için menüleri gizle" msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Komuta " @@ -6235,13 +6260,20 @@ msgstr "Geçersiz Para Birimi." msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +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 "" +msgstr "Sorun Takip Entegrasyonu" #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" @@ -6288,7 +6320,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "Değişiklik listesi koru" @@ -6310,9 +6342,9 @@ msgstr "" msgid "L" msgstr "L" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" -msgstr "" +msgstr "LFS" #. Resource IDs: (IDS_PROGRS_TITLE_LFS_LOCK) msgid "LFS Lock" @@ -7597,6 +7629,16 @@ msgstr "" msgid "Parent(s)" msgstr "" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Şifre" @@ -8555,7 +8597,8 @@ msgstr "Geridön" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Varsayılana Geridön" @@ -8709,11 +8752,6 @@ msgstr "" msgid "S" msgstr "S" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -8797,7 +8835,7 @@ msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) msgid "SafeCrLf:" -msgstr "" +msgstr "SafeCrLf:" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9109,8 +9147,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "İşlem bitiminde durum diyalogunun göstereceği bir davranışı türü seçiniz." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9146,7 +9184,8 @@ msgstr "" #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "" @@ -9479,6 +9518,11 @@ msgstr "Günlüğü görüntüle..." msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9710,6 +9754,20 @@ msgstr "Kümelenmiş Diyagram (Çubuk)" msgid "Stacked Line Graph" msgstr "Kümelenmiş Diyagram (Çizgi)" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Standart" @@ -10670,6 +10728,14 @@ msgstr "To:" msgid "Toggle filters" msgstr "" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10765,7 +10831,7 @@ msgid "" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "" +msgstr "TortoiseGitBlame\n\nTortoiseGitBlame\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10789,8 +10855,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseGitIDiff: TortoiseSVN'nin resimler arası farklılıkları karşılaştıran program\n\nGeçerli komutlar:\n/left:\"Soldaki resimin dizini\"\n/lefttitle:\"Soldaki resimin başlığı\"\n/right:\"Sağdaki resimin dizini\"\n/righttitle:\"Sağdaki resimin başlığı\"\n/overlay\t\toverlay modunu aç\n/fit\t\t resimleri pencereye yerleştir\n/showinfo\t\t resim bilgi kutucuklarini göster" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10987,6 +11053,11 @@ msgstr "%1 'e yazılamadı, ya salt-okunur bir dosya yada bir başkası tarafın msgid "Uncheck" msgstr "Boşalt" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11060,6 +11131,16 @@ msgstr "Çözülmemiş çakışmalar!" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Başlıksız" @@ -11114,30 +11195,10 @@ msgstr "2-dosyalı karşılaştırmanın &tek pencereli görünümü" msgid "Use &other text block" msgstr "Başka& metin bloğunu kullan" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "'benim' metin bloğunu kullan" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Önce 'benim' metin bloğunu kullan sonra 'onların' kini" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "'onların' metin bloğunu kullan" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Önce 'onların' metin bloğunu kullan sonra 'benim' kini" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11223,11 +11284,13 @@ msgstr "Sol bloğu kullan" msgid "Use left file" msgstr "Soldaki dosyayı kullan" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11247,11 +11310,12 @@ msgstr "Kurallı ifade kullan" msgid "Use right block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11472,10 +11536,19 @@ msgstr ".tgitconfig dosyasını görüntüle" msgid "View Bars" msgstr "" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "Yamayı göster" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11521,7 +11594,7 @@ msgid "Waiting for input" msgstr "Giriş için bekleniyor" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11608,6 +11681,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11634,6 +11721,10 @@ msgstr "" msgid "Whitespaces" msgstr "Boşluklar" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12063,6 +12154,10 @@ msgstr "" msgid "file/foldernames" msgstr "dosya/klasörismi" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "" @@ -12144,15 +12239,15 @@ msgstr "manager - yalnızca bu depo" #. Resource IDs: (IDS_SYSTEM_GCMCORE) msgid "manager-core - all Windows users" -msgstr "" +msgstr "manager-core - tüm Windows kullanıcıları" #. Resource IDs: (IDS_GLOBAL_GCMCORE) msgid "manager-core - current Windows user" -msgstr "" +msgstr "manager-core - geçerli Windows kullanıcısı" #. Resource IDs: (IDS_LOCAL_GCMCORE) msgid "manager-core - this repository only" -msgstr "" +msgstr "manager-core - yalnızca bu depo" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1494) msgid "master" @@ -12300,10 +12395,6 @@ msgstr "buraya %1" msgid "to %s" msgstr "%s üzerine" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "&bilinmeyen değişiklikler" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "hafta" diff --git a/Languages/Tortoise_uk.po b/Languages/Tortoise_uk.po index cdb0667e1..304fa4e64 100644 --- a/Languages/Tortoise_uk.po +++ b/Languages/Tortoise_uk.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Ukrainian (http://www.transifex.com/lznuaa/tortoisegit/language/uk/)\n" "MIME-Version: 1.0\n" @@ -722,9 +722,10 @@ msgstr "&Шрифт повідомлень логу:" msgid "&Font:" msgstr "&Шрифт:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "&Примусовий" @@ -1238,6 +1239,10 @@ msgstr "" msgid "&Squash ALL" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Почати" @@ -1342,6 +1347,10 @@ msgstr "&Невідомі диски" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "&Вгору" @@ -1397,14 +1406,14 @@ msgstr "&Так" msgid "&add \"cherry picked from\"" msgstr "" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "&ігнорувати зміни пробілів" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "&відомі зміни" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(TortoiseGit за замовчуванням)" @@ -2917,6 +2926,10 @@ msgstr "Закриває активне вікно і пропонує збер msgid "Collapse" msgstr "Згорнути" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4660,6 +4673,10 @@ msgstr "" msgid "Exit" msgstr "Вийти" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Відкрити Провідником" @@ -5177,10 +5194,6 @@ msgstr "" msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5263,6 +5276,10 @@ msgstr "" msgid "Full data" msgstr "" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "Повно текстовий пошук" @@ -5573,6 +5590,14 @@ msgstr "Скривати меню для неверсіованних шляхі msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Ховати скрипт поки він виконується" @@ -6214,6 +6239,13 @@ msgstr "Неправильна грошова одиниця." msgid "Invalid revision number!" msgstr "Невірний номер ревізії!" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6267,7 +6299,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "Залишити" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "" @@ -6289,7 +6321,7 @@ msgstr "Корейска" msgid "L" msgstr "" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -7576,6 +7608,16 @@ msgstr "" msgid "Parent(s)" msgstr "" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "Пароль" @@ -8534,7 +8576,8 @@ msgstr "Відновити" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Відновити типове" @@ -8688,11 +8731,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -9088,8 +9126,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Виберіть поведінку діалога поступу наприкінці операції." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9125,7 +9163,8 @@ msgstr "Виберіть який файл ви хочете зберігти я #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "Вибрати/зняти усє" @@ -9458,6 +9497,11 @@ msgstr "Показати лог..." msgid "Show long format even if a tag is exactly on that commit" msgstr "Показувати довгий формат навіть якщо тег явно у фіксуванні" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9689,6 +9733,20 @@ msgstr "Стосова гістограма" msgid "Stacked Line Graph" msgstr "Стосова лінійна діаграма" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Стандартно" @@ -10649,6 +10707,14 @@ msgstr "До:" msgid "Toggle filters" msgstr "Ввімкнути фільтри" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10768,8 +10834,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10966,6 +11032,11 @@ msgstr "Нездатен писати у %1, він лише-для-читанн msgid "Uncheck" msgstr "Зняти позначку" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11039,6 +11110,16 @@ msgstr "Невирішені конфлікти!" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Безіменний" @@ -11093,30 +11174,10 @@ msgstr "Використовувати &однопанельне подання msgid "Use &other text block" msgstr "Використати &інший текстовий блок" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Використати \"мій\" блок" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Спочатку використати \"мій\" блок, потім \"їхній\"" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Використати \"їхній\" блок" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Спочатку використати \"їхній\" блок, потім \"мій\"" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11202,11 +11263,13 @@ msgstr "Використати лівий блок" msgid "Use left file" msgstr "Використати лівий файл" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11226,11 +11289,12 @@ msgstr "Використати регулярний вираз" msgid "Use right block" msgstr "Використати правий блок" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11451,10 +11515,19 @@ msgstr "" msgid "View Bars" msgstr "" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "Переглянути патч" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11500,7 +11573,7 @@ msgid "Waiting for input" msgstr "Очікується ввід даних" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11587,6 +11660,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "Посилатися тільки анатовані теги, усі теги або усі refs" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11613,6 +11700,10 @@ msgstr "Зміни в недрукованих символах (таби, пр msgid "Whitespaces" msgstr "Недруковані символи" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12042,6 +12133,10 @@ msgstr "" msgid "file/foldernames" msgstr "" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "" @@ -12279,10 +12374,6 @@ msgstr "до %1" msgid "to %s" msgstr "до %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "тиждень" diff --git a/Languages/Tortoise_vi.po b/Languages/Tortoise_vi.po index ba9e58b90..8782e3fec 100644 --- a/Languages/Tortoise_vi.po +++ b/Languages/Tortoise_vi.po @@ -1,11 +1,12 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # # Translators: # Anh Phan , 2013 # Anh Phan , 2013-2014 +# ducdat0507 , 2021 # Lübbe , 2012 # Anh Phan , 2013 # Anh Phan , 2013 @@ -15,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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Vietnamese (http://www.transifex.com/lznuaa/tortoisegit/language/vi/)\n" "MIME-Version: 1.0\n" @@ -74,7 +75,7 @@ msgstr "%1 có định dạng xấu." #. Resource IDs: (AFX_IDP_FILE_NOT_FOUND) #, c-format msgid "%1 was not found." -msgstr "Không tìm thấy %1 ." +msgstr "Không tìm thấy %1." #. Resource IDs: (IDS_DAY_AGO) #, c-format @@ -144,7 +145,7 @@ msgstr "%1!d! Năm trước" #. Resource IDs: (IDS_PROC_SYNC_COMMITSAHEAD) #, c-format msgid "%1!d! commits ahead \"%2!s!\"" -msgstr "" +msgstr "%1!d! giao thác phía trước \"%2!s!\"" #. Resource IDs: (IDS_STATUSLIST_FILESREVERTED) #, c-format @@ -195,7 +196,7 @@ msgstr "" #. Resource IDs: (IDS_GITVER_REQUIRED) #, c-format msgid "%1!s! requires Git >= %2!s!" -msgstr "" +msgstr "%1!s! yêu cầu Git >= %2!s!" #. Resource IDs: (IDS_SVN_PROGRESS_TOTALANDSPEED) #, c-format @@ -249,7 +250,7 @@ msgstr "%I64d KiB được truyền tải" #. Resource IDs: (AFX_IDS_AUTOSAVE_RECOVERED) #, c-format msgid "%Ts [Recovered]" -msgstr "%Ts [Phục hồi]" +msgstr "%Ts [Đã phục hồi]" #. Resource IDs: (AFX_IDS_EMBED_FORMAT, AFX_IDS_LINKSOURCE_FORMAT) #, c-format @@ -364,7 +365,7 @@ msgstr "&Nâng cao..." #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1701) msgid "&All" -msgstr "&Tất Cả" +msgstr "&Tất cả" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 3936) msgid "&All Branches" @@ -418,7 +419,7 @@ msgstr "&Nhánh:" #. Resource IDs: (IDS_LOG_BROWSEREPO) msgid "&Browse repository" -msgstr "&Duyệt Kho Chứa" +msgstr "&Duyệt kho chứa" #. Resource IDs: (Dialog IDD_CLONE: Control id 1382, Dialog IDD_OPENDLG: #. Control id 1001, Dialog IDD_OPENDLG: Control id 1009, IDS_PROC_CLONE_DIR) @@ -485,7 +486,7 @@ msgstr "" #. Resource IDs: (IDS_MSGBOX_CONTINUE) msgid "&Continue" -msgstr "" +msgstr "Tiếp tụ&c" #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 1471, Dialog #. IDD_SETTINGSHOOKS: Control id 1367, IDS_EDIT_COPY, ID_EDIT_COPY - Menu) @@ -507,7 +508,7 @@ msgstr "&Tùy biến" #. Resource IDs: (ID_VIEW_DARKMODE - Menu) msgid "&Dark Mode" -msgstr "" +msgstr "Chế độ &tối" #. Resource IDs: (ID_VIEW_DARKMODE - Menu) msgid "&Dark Mode\tD" @@ -536,7 +537,7 @@ msgstr "" #. Resource IDs: (IDS_DELETE_BRANCHTAG) msgid "&Delete branch/tag" -msgstr "" +msgstr "&Xóa nhánh/nhãn" #. Resource IDs: (65535 - PopupMenu) msgid "&Detect moved or copied lines" @@ -638,7 +639,7 @@ msgstr "&Email:" #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQADV: Control id 1023, Dialog #. IDD_SETTINGSHOOKCONFIG: Control id 1023) msgid "&Enable" -msgstr "" +msgstr "Kích hoạt" #. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 1023) msgid "&Enable Proxy Server" @@ -709,9 +710,10 @@ msgstr "&Phông chữ cho các thông điệp tường trình:" msgid "&Font:" msgstr "&Phông chữ:" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "&Bắt buộc" @@ -729,11 +731,11 @@ msgstr "" #. Resource IDs: (Dialog IDD_FIRSTSTARTWIZARD_AUTHENTICATION: Control id 1844) msgid "&Generate PuTTY key pair" -msgstr "" +msgstr "&Tạo cặp khóa PuTTY" #. Resource IDs: (65535 - PopupMenu) msgid "&Git" -msgstr "" +msgstr "&Git" #. Resource IDs: (Dialog IDD_SVNDCOMMITTYPE: Control id 2153) msgid "&Git Style Commit (--rmdir)" @@ -742,11 +744,11 @@ msgstr "&Mẫu đệ trình Git (--rmdir)" #. Resource IDs: (Dialog IDD_FIRSTSTARTWIZARD_GIT: Control id 65535, Dialog #. IDD_SETTINGSMAIN: Control id 65535) msgid "&Git.exe Path:" -msgstr "" +msgstr "Đường dẫn &Git.exe:" #. Resource IDs: (ID_EDIT_GOTO - Menu) msgid "&Go to\tCtrl+G" -msgstr "" +msgstr "Đ&i tới\tCtrl+G" #. Resource IDs: (IDS_SHOWFILES_GRAYPATHS) msgid "&Gray Unrelated Changed Paths" @@ -785,7 +787,7 @@ msgstr "&Bộ biểu tượng:" #. Resource IDs: (IDS_IGNOREBUTTON, IDS_MSGBOX_IGNORE) msgid "&Ignore" -msgstr "" +msgstr "&Bỏ qua" #. Resource IDs: (IDS_MENUIGNOREMULTIPLE) #, c-format @@ -798,7 +800,7 @@ msgstr "" #. Resource IDs: (ID_VIEW_IGNORE_WHITESPACE - Menu) msgid "&Ignore whitespace" -msgstr "" +msgstr "&Bỏ qua khoảng trắng" #. Resource IDs: (ID_VIEW_IMAGEINFO - Menu) msgid "&Image info\tI" @@ -814,7 +816,7 @@ msgstr "" #. Resource IDs: (IDS_PROC_INSTALL) msgid "&Install" -msgstr "" +msgstr "Cài đặt" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1016) msgid "&Jump to first difference when loading" @@ -847,7 +849,7 @@ msgstr "&Tìm kiếm giới hạn trong các dòng bị thay đổi" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 65535) msgid "&Limit:" -msgstr "&Giới hạn" +msgstr "&Giới hạn:" #. Resource IDs: (Dialog IDD_GOTO: Control id 1078) msgid "&Line number" @@ -952,7 +954,7 @@ msgstr "&Trang tiếp theo" #. Resource IDs: (IDS_MSGBOX_NO) msgid "&No" -msgstr "" +msgstr "&Không" #. Resource IDs: (Dialog IDD_SUBMODULE_UPDATE: Control id 1734) msgid "&No fetch" @@ -989,7 +991,7 @@ msgstr "" #. Resource IDs: (ID_FILE_OPEN - Menu) msgid "&Open...\tCtrl+O" -msgstr "" +msgstr "&Mở...\tCtrl+O" #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQADV: Control id 1382) msgid "&Options" @@ -1005,7 +1007,7 @@ msgstr "&Ảnh nạp chồng\tO" #. Resource IDs: (Dialog IDD_GITSWITCH: Control id 1523) msgid "&Override branch if exists" -msgstr "" +msgstr "&Ghi đè nhánh nếu tồn tại" #. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 1411, Dialog #. IDD_SIMPLEPROMPT: Control id 65535, Dialog IDD_USER_PASSWD: Control id @@ -1050,7 +1052,7 @@ msgstr "" #. Resource IDs: (IDS_PROC_SYNC_PULL) msgid "&Pull" -msgstr "" +msgstr "Ké&o" #. Resource IDs: (IDS_MENUPULL) msgid "&Pull..." @@ -1062,7 +1064,7 @@ msgstr "&Đẩy tất cả nhánh" #. Resource IDs: (IDS_COMMIT_RECOMMIT, IDS_PROC_COMMIT_RECOMMIT) msgid "&ReCommit" -msgstr "" +msgstr "Giao thác &lại" #. Resource IDs: (IDS_REBASEBUTTON) msgid "&Rebase" @@ -1126,7 +1128,7 @@ msgstr "&Duyệt Kho Chứa" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1355) msgid "&Reset filter" -msgstr "" +msgstr "Đặ&t lại bộ lọc" #. Resource IDs: (IDS_RESOLVEDBUTTON) msgid "&Resolved" @@ -1142,7 +1144,7 @@ msgstr "" #. Resource IDs: (IDS_MSGBOX_RETRY) msgid "&Retry" -msgstr "" +msgstr "&Thử lại" #. Resource IDs: (IDS_LOG_POPUP_REVERTREV) msgid "&Revert change by this commit" @@ -1186,11 +1188,11 @@ msgstr "&Lưu\tCtrl+S" #. Resource IDs: (Dialog IDD_REFLOG: Control id 1687) msgid "&Search..." -msgstr "" +msgstr "&Tìm..." #. Resource IDs: (IDS_PROC_SETMSYSGITPATH) msgid "&Set Git path" -msgstr "" +msgstr "&Đặt đường dẫn Git" #. Resource IDs: (Dialog IDD_PUSH: Control id 1486) msgid "&Set upstream/track remote branch" @@ -1210,7 +1212,7 @@ msgstr "&Gán chỉ mục khóa:" #. Resource IDs: (IDS_SKIPBUTTON) msgid "&Skip" -msgstr "" +msgstr "&Bỏ qua" #. Resource IDs: (Dialog IDD_RESET: Control id 1550) msgid "&Soft: Leave working tree and index untouched" @@ -1225,6 +1227,10 @@ msgstr "&Nén chặt" msgid "&Squash ALL" msgstr "&Nén chặt tất cả" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "&Bắt đầu" @@ -1329,6 +1335,10 @@ msgstr "&Ổ đĩa không nhận ra" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "&Lên" @@ -1378,20 +1388,20 @@ msgstr "" #. Resource IDs: (IDS_MSGBOX_YES) msgid "&Yes" -msgstr "" +msgstr "&Có" #. Resource IDs: (Dialog IDD_REBASE: Control id 1682) msgid "&add \"cherry picked from\"" msgstr "" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "&bỏ qua sự thay đổi trên khoảng trắng" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "" @@ -1399,7 +1409,7 @@ msgstr "" #. Resource IDs: (IDS_STATUSLIST_FROM) #, c-format msgid "(from %s)" -msgstr "" +msgstr "(từ %s)" #. Resource IDs: (IDS_STATUSLIST_UNASSIGNED_CHANGESET) msgid "(no changelist)" @@ -1488,7 +1498,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_FINDBAR: Control id 1020) msgid "< &Previous" -msgstr "" +msgstr "< &Trước" #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 65535, Dialog IDD_SETTINGSDIALOGS3: @@ -1498,31 +1508,31 @@ msgstr "<<" #. Resource IDs: (IDS_PROC_LOG_ALLBRANCHES) msgid "" -msgstr "" +msgstr "" #. Resource IDs: (IDS_PROC_AUTOGENERATEDBYGIT) msgid "" -msgstr "" +msgstr "" #. Resource IDs: (IDS_PROC_LOG_BASIC_REFS) msgid "" -msgstr "" +msgstr "" #. Resource IDs: (IDS_PROC_LOG_LOCAL_BRANCHES) msgid "" -msgstr "" +msgstr "" #. Resource IDs: (IDS_PROC_LOG_NOBRANCH) msgid "" -msgstr "" +msgstr "" #. Resource IDs: (IDS_STATUSLIST_CONTEXT_CREATECS) msgid "" -msgstr "" +msgstr "" #. Resource IDs: (ID_VIEW_TOOLBAR - Menu) msgid "" -msgstr "" +msgstr "" #. Resource IDs: (ID_ABOUT - Menu) msgid "?" @@ -1596,7 +1606,7 @@ msgstr "" #. Resource IDs: (IDS_MENUABOUT) msgid "A&bout" -msgstr "D&ịch bởi Phan Anh" +msgstr "&Giới thiệu" #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1) msgid "A&pply" @@ -1645,7 +1655,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 1) msgid "Accept certificate" -msgstr "" +msgstr "Chấp nhận chứng chỉ" #. Resource IDs: (AFX_IDP_FILE_ACCESS_DENIED) #, c-format @@ -1769,7 +1779,7 @@ msgstr "Điều chỉnh thiết lập\nCác thiết lập" #. Resource IDs: (Dialog IDD_SETTINGS_CONFIG: Control id 340, IDS_ADVANCED) msgid "Advanced" -msgstr "Cao cấp" +msgstr "Nâng cao" #. Resource IDs: (Dialog IDD_SETTINGSPROGSADV: Control id 170) msgid "Advanced Diff/Merge Settings" @@ -1935,7 +1945,7 @@ msgstr "" #. Resource IDs: (ID_FILE_APPLYPATCH - Menu) msgid "Apply &Patch..." -msgstr "" +msgstr "Á&p dụng bản vá…" #. Resource IDs: (IDS_MENUIMPORTPATCH) msgid "Apply Patch Serial..." @@ -1943,7 +1953,7 @@ msgstr "Áp dụng mã số vá..." #. Resource IDs: (IDS_MENU_APPLY, IDS_OPENDIFFFILETITLE) msgid "Apply Patch..." -msgstr "Áp dụng vá..." +msgstr "Áp dụng bản vá..." #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 311) msgid "Apply Patches" @@ -2086,7 +2096,7 @@ msgstr "Tác giả" #. Resource IDs: (IDS_PROC_LOG_AUTHOREMAIL) msgid "Author Email" -msgstr "" +msgstr "Email tác giả" #. Resource IDs: (IDS_LOG_POPUP_CLIPBOARD_AUTHORSEMAIL) msgid "Author email addresses" @@ -2118,7 +2128,7 @@ msgstr "Tự động chuyển đổi CrLf" #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 65535) msgid "Auto&CrLf:" -msgstr "" +msgstr "Tự động &CrLf:" #. Resource IDs: (IDS_PROGRS_CLOSE_NOCONFLICTS) msgid "Auto-close if no conflicts" @@ -2144,7 +2154,7 @@ msgstr "Tự động điền đủ cho những từ gợi ý (thường là lớ #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) msgid "AutoCrLf:" -msgstr "" +msgstr "Tự động CrLf:" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" @@ -2186,7 +2196,7 @@ msgstr "" #. Resource IDs: (IDS_STATGRAPH_BARBUTTON_TT) msgid "Bar Graph" -msgstr "Biểu đồ thanh" +msgstr "Biểu đồ cột" #. Resource IDs: (Dialog IDD_RESOLVESUBMODULECONFLICT: Control id 1385, #. IDS_PROC_DIFF_BASE) @@ -2207,7 +2217,7 @@ msgstr "" #. Resource IDs: (IDS_PROPERTIES_BASICINFO) msgid "Basic Info" -msgstr "" +msgstr "Thông tin cơ bản" #. Resource IDs: (Dialog IDD_SETTINGSTBLAME: Control id 65535) msgid "Between files:" @@ -2298,7 +2308,7 @@ msgstr "&Duyệt..." #. Resource IDs: (Dialog IDD_CLONE: Control id 1510) msgid "Branc&h:" -msgstr "" +msgstr "Nhán&h:" #. Resource IDs: (Dialog IDD_CLONE: Control id 1527, Dialog IDD_LOGMESSAGE: #. Control id 1579, Dialog IDD_SUBMODULE_ADD: Control id 1586, @@ -2312,7 +2322,7 @@ msgstr "" #. Resource IDs: (IDS_BRANCHNAME) msgid "Branch Name" -msgstr "" +msgstr "Tên nhánh" #. Resource IDs: (IDS_REV_COUNTER) msgid "Branch RevNo" @@ -2339,7 +2349,7 @@ msgstr "Nhánh:" #. Resource IDs: (Dialog IDD_CLONE: Control id 1383) msgid "Bro&wse..." -msgstr "" +msgstr "&Duyệt..." #. Resource IDs: (IDS_MENUREFBROWSE) msgid "Browse References" @@ -2399,7 +2409,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 @@ -2409,11 +2419,11 @@ msgstr "&Kiểm tra ngay" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1, IDS_COMMIT_COMMIT) msgid "C&ommit" -msgstr "" +msgstr "Gia&o thác" #. Resource IDs: (IDS_LOG_POPUP_COMMIT) msgid "C&ommit..." -msgstr "" +msgstr "Gia&o thác..." #. Resource IDs: (IDS_LOG_POPUP_COPY) msgid "C&reate branch/tag from revision" @@ -2433,7 +2443,7 @@ msgstr "CC:" #. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1741) msgid "Calculate" -msgstr "" +msgstr "Tính toán" #. Resource IDs: (IDS_ERR_GITCALLFAILED) #, c-format @@ -2455,7 +2465,7 @@ msgid "" "%1!s!\n" "to\n" "%2!s!" -msgstr "" +msgstr "Không thể sao chép\n%1!s!\nđến\n%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 @@ -2496,7 +2506,7 @@ msgstr "Hủy" msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" -msgstr "" +msgstr "Hủy bỏ\nĐừng thoát TortoiseGitMerge" #. Resource IDs: (IDS_ASKFORSAVE_TASK8) msgid "" @@ -2567,7 +2577,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_CHECKFORUPDATES: Control id 1697) msgid "Change log" -msgstr "" +msgstr "Nhật ký thay đổi" #. Resource IDs: (57606) msgid "" @@ -2647,7 +2657,7 @@ msgstr "Kiểm tra" #. Resource IDs: (Dialog IDD_CHECKFORUPDATES: Control id 174) msgid "Check For Updates - TortoiseGit" -msgstr "" +msgstr "Kiểm tra cập nhật - TortoiseGit" #. Resource IDs: (Dialog IDD_ABOUT: Control id 1031) msgid "Check For Updates..." @@ -2731,7 +2741,7 @@ msgstr "" #. Resource IDs: (IDS_CHOOSE_REPOSITORY) msgid "Choose Repository" -msgstr "" +msgstr "Chọn kho chứa" #. Resource IDs: (IDS_LOG_CHRONOLOGICALREVERSEDORDER) msgid "Chronological reversed (git default)" @@ -2739,7 +2749,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_CLEAN: Control id 4572) msgid "Clean" -msgstr "" +msgstr "Dọn dẹp" #. Resource IDs: (Dialog IDD_CLEAN: Control id 1630) msgid "Clean Type" @@ -2786,7 +2796,7 @@ msgstr "Dọn dẹp đã thành công khi xử lý các đường dẫn sau:\n%s #. Control id 1427, Dialog IDD_SETTINGSSAVEDDATA: Control id 1726, Dialog #. IDD_SETTINGSSAVEDDATA: Control id 1727) msgid "Clear" -msgstr "Dọn dẹp" +msgstr "Xóa" #. Resource IDs: (IDS_SETTINGS_SAVEDDATA_URLHIST_TT) #, c-format @@ -2853,15 +2863,15 @@ msgstr "Bảng kẹp tạm" #. Resource IDs: (IDS_PROGRS_TITLE_CLONE, IDS_PROG_CLONE) msgid "Clone" -msgstr "" +msgstr "Nhân bản" #. Resource IDs: (Dialog IDD_CLONE: Control id 1572) msgid "Clone Existing Repository" -msgstr "Nhân bản từ phần tài nguyên hiện tại" +msgstr "Nhân bản kho chứa sẵn có" #. Resource IDs: (IDS_MENUDESCCLONE) msgid "Clone a repository" -msgstr "" +msgstr "Nhân bản một kho chứa" #. Resource IDs: (Dialog IDD_CLONE: Control id 1653) msgid "Clone into Bare Repo" @@ -2882,7 +2892,7 @@ msgstr "Đóng" #. Resource IDs: (IDS_PROGRS_CLOSE_MANUAL) msgid "Close manually" -msgstr "Đóng bằng tay" +msgstr "Đóng thủ công" #. Resource IDs: (AFX_IDS_PREVIEW_CLOSE) msgid "" @@ -2904,6 +2914,10 @@ msgstr "Đóng cửa sổ đang hoạt động và hiện yêu cầu lưu các t msgid "Collapse" msgstr "Thu gọn" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -2922,15 +2936,15 @@ msgstr "Các màu" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) msgid "Colors 1" -msgstr "" +msgstr "Màu 1" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) msgid "Colors 2" -msgstr "" +msgstr "Màu 2" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) msgid "Colors 3" -msgstr "" +msgstr "Màu 3" #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format @@ -2939,7 +2953,7 @@ msgstr "" #. Resource IDs: (IDS_COMBINE_TO_ONE) msgid "Com&bine to one commit" -msgstr "" +msgstr "Gộp lại thành một giao thác" #. Resource IDs: (Dialog IDD_SENDMAIL: Control id 1481) msgid "Combine One Mail" @@ -2966,29 +2980,29 @@ msgstr "Lệnh thất bại" #. 1083, Dialog IDD_SETTINGSDIALOGS3: Control id 65535, IDS_COMMITBUTTON, #. IDS_PROGRS_CMD_COMMIT, IDS_PROGRS_TITLE_COMMIT) msgid "Commit" -msgstr "Cam kết" +msgstr "Giao thác" #. Resource IDs: (IDS_REPOBROWSEASKSUBMODULEUPDATE) #, c-format msgid "Commit %1!s! not found in \"%2!s!\". Update submodule now?" -msgstr "" +msgstr "Giao thác %1!s! không tìm thấy trong \"%2!s!\". Cập nhật mô-đun phụ bây giờ?" #. Resource IDs: (IDS_LOG_NOT_VISIBLE) #, c-format msgid "Commit %s is NOT visible right now." -msgstr "" +msgstr "Giao thác %s đang không được hiển thị bây giờ." #. Resource IDs: (IDS_COMMIT_COMMITPUSH) msgid "Commit && &Push" -msgstr "" +msgstr "Giao thác && Đẩ&y" #. Resource IDs: (IDS_LOG_COMMIT_DATE) msgid "Commit Date" -msgstr "" +msgstr "Ngày giao thác" #. Resource IDs: (IDS_LOG_COMMIT_EMAIL) msgid "Commit Email" -msgstr "" +msgstr "Email giao thác" #. Resource IDs: (IDS_COMMIT_FINISH) msgid "Commit Finish" @@ -2996,56 +3010,56 @@ msgstr "" #. Resource IDs: (IDS_PROPERTIES_WND) msgid "Commit Info" -msgstr "" +msgstr "Thông tin giao thác" #. Resource IDs: (IDS_PROC_COMMITMESSAGE) msgid "Commit Message" -msgstr "" +msgstr "Thông điệp giao thác" #. Resource IDs: (IDS_LOG_COMMIT_NAME) msgid "Commit Name" -msgstr "" +msgstr "Tên giao thác" #. Resource IDs: (Dialog IDD_LOGORDERING: Control id 1750) msgid "Commit Ordering:" -msgstr "" +msgstr "Thứ tự giao thác:" #. Resource IDs: (IDS_PROC_COMMIT_SUPERPROJECT) msgid "Commit super project" -msgstr "" +msgstr "Giao thác siêu dự án" #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1110) msgid "Commit to:" -msgstr "Cam kết tới:" +msgstr "Giao thác tới:" #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COMMIT) msgid "Commit..." -msgstr "Cam kết..." +msgstr "Giao thác..." #. Resource IDs: (IDS_STATGRAPH_COMMITSBYAUTHOR) msgid "Commits by author" -msgstr "Các cam kết bởi tác giả" +msgstr "Các giao thác bởi tác giả" #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATE) msgid "Commits by date" -msgstr "Các cam kết theo ngày" +msgstr "Các giao thác theo ngày" #. Resource IDs: (IDS_STATGRAPH_COMMITSBYUNIT) #, c-format msgid "Commits each %s" -msgstr "Các cam kết mỗi %s" +msgstr "Các giao thác mỗi %s" #. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1135) msgid "Commits each week:" -msgstr "Các cam kết mỗi tuần:" +msgstr "Các giao thác mỗi tuần:" #. Resource IDs: (IDS_MENUDESCCOMMIT) msgid "Commits your changes to the repository" -msgstr "Cam kết những thay đổi của bạn vào kho chứa" +msgstr "Giao thác những thay đổi của bạn vào kho chứa" #. Resource IDs: (IDS_PROC_LOG_COMMITTEREMAIL) msgid "Committer Email" -msgstr "" +msgstr "Email người giao thác" #. Resource IDs: (IDS_COMMITDLG_UNVERSIONEDFOLDERWARNING) msgid "" @@ -3057,7 +3071,7 @@ msgstr "Cam kết một thư mục chưa được tạo phiên bản sẽ không #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Common Name:" -msgstr "" +msgstr "Tên thông thường:" #. Resource IDs: (IDS_LOG_POPUP_COMPARECHANGESET) msgid "Comp&are change sets" @@ -3066,7 +3080,7 @@ msgstr "" #. Resource IDs: (IDS_REVGRAPH_POPUP_COMPAREHEADS, #. ID_VIEW_COMPAREHEADREVISIONS - Menu) msgid "Compare &HEAD revisions" -msgstr "So sánh các bản chỉnh sửa &CHÍNH" +msgstr "So sánh các bản chỉnh sửa &HEAD" #. Resource IDs: (IDS_LOG_POPUP_COMPARE_PARENT_WC) msgid "Compare parent with working tree" @@ -3247,7 +3261,7 @@ msgstr "Sao chép" #. Resource IDs: (IDS_BLAME_POPUP_COPYHASHTOCLIPBOARD, IDS_COPY_COMMIT_HASH) msgid "Copy SHA-1 to clipboard" -msgstr "" +msgstr "Sao chép SHA-1 sang bảng tạm" #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYEXT) msgid "Copy all information to clipboard" @@ -3334,7 +3348,7 @@ msgstr "Không thể xác định được bản chỉnh sửa cuối cùng!" #. Resource IDs: (IDS_ERR_NOTFOUND_SUPER_PRJECT) msgid "Could not find Super-project" -msgstr "" +msgstr "Không thể tìm siêu dự án" #. Resource IDs: (IDS_ERR_GITNEEDHACKS) msgid "" @@ -3459,7 +3473,7 @@ msgstr "Không thể bắt đầu mạch!" #. Resource IDs: (Dialog IDD_FIND: Control id 1501) msgid "Coun&t" -msgstr "" +msgstr "Đế&m" #. Resource IDs: (IDS_FIND_COUNT) #, c-format @@ -3468,7 +3482,7 @@ msgstr "" #. Resource IDs: (IDS_MENUBRANCH) msgid "Create &Branch..." -msgstr "" +msgstr "Tạo &nhánh..." #. Resource IDs: (Dialog IDD_SETTINGSMAIN: Control id 1683) msgid "Create &Library" @@ -3476,7 +3490,7 @@ msgstr "Tạo &thư viện" #. Resource IDs: (Dialog IDD_GITSWITCH: Control id 1527) msgid "Create &New Branch" -msgstr "" +msgstr "Tạo nhánh &mới" #. Resource IDs: (IDS_CREATE_TAG_AT_THIS) msgid "Create &Tag at this version..." @@ -3488,19 +3502,19 @@ msgstr "" #. Resource IDs: (cmdCreateUnifiedDiff_LabelTitle_RESID) msgid "Create &patch file" -msgstr "" +msgstr "Tạo tệp &vá" #. Resource IDs: (Dialog IDD_SVNIGNORE: Control id 1641) msgid "Create .gitignore file" -msgstr "" +msgstr "Tạo tệp .gitignore" #. Resource IDs: (IDS_CREATE_BRANCH_AT_THIS) msgid "Create Br&anch at this version..." -msgstr "" +msgstr "Tạo nhánh tại &phiên bản này" #. Resource IDs: (IDS_PROGS_TITLE_CREATEBRANCH) msgid "Create Branch" -msgstr "" +msgstr "Tạo nhánh" #. Resource IDs: (Dialog IDD_CREATECHANGELIST: Control id 243) msgid "Create Changelist" @@ -3508,17 +3522,17 @@ msgstr "Tạo danh sách thay đổi" #. Resource IDs: (IDS_MENUFORMATPATCH) msgid "Create Patch Serial..." -msgstr "" +msgstr "Tạo mã số vá..." #. Resource IDs: (IDS_PROGS_TITLE_CREATETAG) msgid "Create Tag" -msgstr "" +msgstr "Tạo nhãn" #. Resource IDs: (57600) msgid "" "Create a new document\n" "New" -msgstr "" +msgstr "Tạo một tài liệu mới\nMới" #. Resource IDs: (IDS_CLONE_DEPTH_TT) msgid "" @@ -3531,15 +3545,15 @@ msgstr "" #. Resource IDs: (ID_EDIT_CREATEUNIFIEDDIFFFILE - Menu) msgid "Create patch file" -msgstr "Tạo tập tin vá" +msgstr "Tạo tệp vá" #. Resource IDs: (IDS_PROC_REQUESTPULL) msgid "Create pull &request" -msgstr "" +msgstr "Tạo &yêu cầu kéo" #. Resource IDs: (IDS_MENUCREATEREPOS) msgid "Create repositor&y here..." -msgstr "" +msgstr "Tạo &kho chứa tại đây" #. Resource IDs: (IDS_PROC_CREATED) msgid "Created" @@ -3569,11 +3583,11 @@ msgstr "Tạo tập tin chứa khác biệt thống nhất với tất cả thay #. Resource IDs: (IDS_PROC_CREATINGPULLREUQEST) msgid "Creating pull-request..." -msgstr "" +msgstr "Đang tạo yêu cầu kéo..." #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) msgid "Credential" -msgstr "" +msgstr "Chứng chỉ" #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." @@ -3598,7 +3612,7 @@ msgstr "Nhánh hiện tại" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) msgid "Current Branch:" -msgstr "" +msgstr "Nhánh hiện tại:" #. Resource IDs: (IDS_PROC_COMMIT_DETACHEDWARNING) msgid "" @@ -3631,7 +3645,7 @@ msgstr "Phiên bản hiện tại là: %s" #. Resource IDs: (IDS_TOOLBAR_CUSTOMIZE) msgid "Customize..." -msgstr "" +msgstr "Tùy chỉnh..." #. Resource IDs: (57635) msgid "" @@ -3649,11 +3663,11 @@ msgstr "" #. Resource IDs: (IDS_MENUDAEMON) msgid "Daemon" -msgstr "" +msgstr "Daemon" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 1699) msgid "Dark theme" -msgstr "" +msgstr "Chủ đề tối" #. Resource IDs: (IDS_DARKTHEME_TT) msgid "" @@ -3667,7 +3681,7 @@ msgstr "Ngày tháng" #. Resource IDs: (IDS_DATELASTCOMMIT) msgid "Date Last Commit" -msgstr "" +msgstr "Ngày giao thác cuối" #. Resource IDs: (IDS_DEFAULT) msgid "Default" @@ -3835,11 +3849,11 @@ msgstr "Độ sâu" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 65535) msgid "Describe" -msgstr "" +msgstr "Mô tả" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 65535) msgid "Describe Strategy" -msgstr "" +msgstr "Mô tả chiến thuật" #. Resource IDs: (IDS_DESCRIPTION) msgid "Description" @@ -3887,27 +3901,27 @@ msgstr "Ảnh độc lập với thiết bị\nmột ảnh độc lập với th #. Resource IDs: (Dialog IDD_SETTINGSSAVEDDATA: Control id 1277) msgid "Dialog sizes and positions" -msgstr "Kích thước và vị trí của hộp thoại" +msgstr "Kích thước và vị trí hộp thoại" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 65535) msgid "Dialogs" -msgstr "" +msgstr "Hộp thoại" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) msgid "Dialogs 1" -msgstr "" +msgstr "Hộp thoại 1" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) msgid "Dialogs 2" -msgstr "" +msgstr "Hộp thoại 2" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) msgid "Dialogs 3" -msgstr "" +msgstr "Hộp thoại 3" #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" -msgstr "Tìm Khác Biệt" +msgstr "Diff" #. Resource IDs: (Dialog IDD_DIFFFILES: Control id 1789) msgid "Diff Options" @@ -3994,7 +4008,7 @@ msgstr "Thư mục:" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1796) msgid "Disable sounds" -msgstr "" +msgstr "Vô hiệu hóa âm thanh" #. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1536) msgid "Disable status cache for elevated processes" @@ -4012,7 +4026,7 @@ msgstr "" #. Resource IDs: (IDS_DETECT_MOVED_OR_COPIED_LINES_DISABLED) msgid "Disabled" -msgstr "" +msgstr "Đã vô hiệu" #. Resource IDs: (AFX_IDP_FILE_DISKFULL) #, c-format @@ -4088,7 +4102,7 @@ msgstr "Không hiện thực đơn ngữ cảnh cho các đường dẫn sau:" #. Resource IDs: (Dialog IDD_CLEAN: Control id 1730) msgid "Do not use recycle bin" -msgstr "" +msgstr "Không sử dụng thùng rác" #. Resource IDs: (IDS_PROC_DELETEALLSTASH) #, c-format @@ -4251,7 +4265,7 @@ msgstr "Đừng hiện lại thông điệp này nữa" #. Resource IDs: (IDS_DONE) msgid "Done" -msgstr "" +msgstr "Xong" #. Resource IDs: (Dialog IDD_REBASE: Control id 1384) msgid "Down" @@ -4518,11 +4532,11 @@ msgstr "Gặp lỗi không xác định được khi đang ghi %1." #. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 1759) msgid "Encryption" -msgstr "" +msgstr "Mã hóa" #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1617) msgid "End" -msgstr "" +msgstr "Kết thúc" #. Resource IDs: (IDS_VIEWCONTEXTMENU_EOL) msgid "End of Line Style" @@ -4647,6 +4661,10 @@ msgstr "" msgid "Exit" msgstr "Thoát" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "Tìm hiểu đến" @@ -5164,10 +5182,6 @@ msgstr "" msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5250,6 +5264,10 @@ msgstr "" msgid "Full data" msgstr "" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "" @@ -5560,6 +5578,14 @@ msgstr "Ẩn thực đơn cho các đường dẫn chưa phiên bản" msgid "Hide Patch<<" msgstr "" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "Ẩn kịch bản khi chạy" @@ -6201,6 +6227,13 @@ msgstr "Tiền tệ không hợp lệ" msgid "Invalid revision number!" msgstr "" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "" @@ -6252,9 +6285,9 @@ msgstr "KOI8-U" #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_KEEP) msgid "Keep" -msgstr "" +msgstr "Giữ" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "Giữ danh sách thay đổi" @@ -6276,7 +6309,7 @@ msgstr "" msgid "L" msgstr "" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "" @@ -6444,11 +6477,11 @@ msgstr "Dòng: %*ld" #. Resource IDs: (IDS_FILEDIFF_STATADD, IDS_STATUSLIST_COLADD) msgid "Lines added" -msgstr "" +msgstr "Số dòng đã thêm" #. Resource IDs: (IDS_FILEDIFF_STATDEL, IDS_STATUSLIST_COLDEL) msgid "Lines removed" -msgstr "" +msgstr "Số dòng đã bớt" #. Resource IDs: (57667) msgid "" @@ -6575,7 +6608,7 @@ msgstr "Các thông điệp tường trình (Hiện hộp thoại tường trìn #. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 1760) msgid "Login:" -msgstr "" +msgstr "Đăng nhập:" #. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1550) msgid "M&erge: Resets the index and try to reconstruct the pre-merge state" @@ -6603,16 +6636,16 @@ msgstr "" #. Resource IDs: (Dialog IDD_PUSH: Control id 1382) msgid "Mana&ge" -msgstr "" +msgstr "&Quản lý" #. Resource IDs: (Dialog IDD_SYNC: Control id 1483) msgid "Manage" -msgstr "" +msgstr "Quản lý" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1382, #. IDS_PROC_BROWSEREFS_MANAGEREMOTES) msgid "Manage Remotes" -msgstr "" +msgstr "Quản lý từ xa" #. Resource IDs: (IDS_SVNPROGRESS_MENUMARKASRESOLVED, ID_EDIT_MARKASRESOLVED - #. Menu, cmdMarkResolved_LabelTitle_RESID) @@ -6631,7 +6664,7 @@ msgstr "Đánh dấu để so sánh" #. Resource IDs: (IDS_VIEWCONTEXTMENU_MARKBLOCK) msgid "Mark this block" -msgstr "" +msgstr "Đánh dấu khối này" #. Resource IDs: (IDS_ASKFORSAVE_MARKEDBLOCKS) msgid "Marked Blocks" @@ -6759,7 +6792,7 @@ msgstr "Linh tinh" #. Resource IDs: (IDS_PATHACTIONS_MISSING) msgid "Missing" -msgstr "" +msgstr "Bị thiếu" #. Resource IDs: (AFX_IDS_CHECKLISTBOX_MIXED, IDS_RESET_MIXED) msgid "Mixed" @@ -6870,11 +6903,11 @@ msgstr "Mới" #. Resource IDs: (Dialog IDD_RENAME: Control id 1076) msgid "New &name:" -msgstr "&Tên mới" +msgstr "&Tên mới:" #. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 309) msgid "New Branch/Tag" -msgstr "Nhánh mới/Thẻ đánh dấu" +msgstr "Nhánh/Nhãn mới" #. Resource IDs: (IDS_NEWHASH) msgid "New hash" @@ -7080,7 +7113,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 65535) msgid "Node size" -msgstr "" +msgstr "Kích cỡ nút" #. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1272, IDS_NONE) msgid "None" @@ -7161,7 +7194,7 @@ msgstr "" #. Resource IDs: (IDS_ERROR_NOTHING_COMMIT) msgid "Nothing to commit" -msgstr "" +msgstr "Không có gì để giao thác" #. Resource IDs: (IDS_WARN_NOTE) msgid "Notice" @@ -7226,7 +7259,7 @@ msgstr "OEM 858" #. Resource IDs: (5053 - Menu) msgid "OEM 860: Portuguese" -msgstr "" +msgstr "OEM 860: Tiếng Bồ Đào Nha" #. Resource IDs: (5054 - Menu) msgid "OEM 861: Icelandic" @@ -7238,7 +7271,7 @@ msgstr "OEM 862" #. Resource IDs: (5056 - Menu) msgid "OEM 863: French" -msgstr "" +msgstr "OEM 863: Tiếng Pháp" #. Resource IDs: (5057 - Menu) msgid "OEM 865: Nordic" @@ -7325,15 +7358,15 @@ msgstr "Một hay nhiều tập tin ở trong trạng thái mâu thuẫn." #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1542) msgid "Only Current Branch" -msgstr "" +msgstr "Chỉ nhánh hiện tại" #. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1543) msgid "Only Local Branches" -msgstr "" +msgstr "Chỉ các nhánh nội bộ" #. Resource IDs: (IDS_ONLYMERGEDFILES) msgid "Only Merged Files" -msgstr "" +msgstr "Chỉ các tệp đã sát nhập" #. Resource IDs: (Dialog IDD_SETTINGSTBLAME: Control id 1677, #. ID_VIEW_ONLYCONSIDERFIRSTPARENTS - Menu) @@ -7372,7 +7405,7 @@ msgstr "Mở" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1849) msgid "Open &settings" -msgstr "" +msgstr "Mở &thiết lập" #. Resource IDs: (57601) msgid "" @@ -7382,7 +7415,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 1797) msgid "Open certificate" -msgstr "" +msgstr "Mở chứng chỉ" #. Resource IDs: (cmdOpen) msgid "" @@ -7392,7 +7425,7 @@ msgstr "Mở các tập tin để xem khác biệt hoặc áp dụng một bản #. Resource IDs: (IDS_PATCH_COPYFROMCLIPBOARD) msgid "Open from clipboard" -msgstr "Mở từ clipboard" +msgstr "Mở từ bảng tạm" #. Resource IDs: (IDS_OPENIMAGEFILE) msgid "Open image file..." @@ -7413,7 +7446,7 @@ msgstr "" #. Resource IDs: (IDS_LOG_POPUP_OPENWITH) msgid "Open with..." -msgstr "Mở với" +msgstr "Mở bằng..." #. Resource IDs: (57666) msgid "" @@ -7462,7 +7495,7 @@ msgstr "" #. Resource IDs: (IDS_PROC_SYNC_OUTCOMMITS) msgid "Out Commits" -msgstr "" +msgstr "Giao thác ra" #. Resource IDs: (AFX_IDS_MEMORY_EXCEPTION) msgid "Out of memory." @@ -7474,7 +7507,7 @@ msgstr "" #. Resource IDs: (AFX_IDS_PRINTDEFAULT) msgid "Output.prn" -msgstr "Output.pm" +msgstr "Output.prn" #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) msgid "Overlay Handlers" @@ -7482,7 +7515,7 @@ msgstr "" #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" -msgstr "" +msgstr "Ghi đè" #. Resource IDs: (Dialog IDD_GITSWITCH: Control id 1521) msgid "Overwrite working tree changes (&force)" @@ -7494,15 +7527,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 @@ -7563,6 +7596,16 @@ msgstr "" msgid "Parent(s)" msgstr "" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "" @@ -7611,15 +7654,15 @@ msgstr "" #. Resource IDs: (IDS_PATCH_ALL) msgid "Patch all files" -msgstr "Vá tất cả các món" +msgstr "Vá tất cả các tệp" #. Resource IDs: (IDS_PATCH_SELECTED) msgid "Patch selected files" -msgstr "Vá tất cả các món được chọn" +msgstr "Vá các tệp được chọn" #. Resource IDs: (IDS_PATCHFILEFILTER) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" -msgstr "" +msgstr "Tệp vá (*.diff, *.patch)|*.diff;*.patch|Tất cả tệp (*.*)|*.*||" #. Resource IDs: (IDS_PATCH_PROGTITLE) msgid "Patching" @@ -7628,7 +7671,7 @@ msgstr "Đang vá" #. Resource IDs: (IDS_PATCH_PATHINGFILE) #, c-format msgid "Patching file '%s'" -msgstr "" +msgstr "Đang vá tệp '%s'" #. Resource IDs: (IDS_PATH, IDS_PROGRS_PATH, IDS_SETTINGS_BUGTRAQ_PATHCOL, #. IDS_SETTINGS_HOOKS_PATHCOL, IDS_STATUSLIST_COLFILE) @@ -7659,20 +7702,20 @@ msgstr "Phần trăm" #. Resource IDs: (IDS_PATHACTIONS_PICK, IDS_REBASE_PICK) msgid "Pick" -msgstr "" +msgstr "Chọn" #. Resource IDs: (IDS_COMMITDLG_POPUP_PICKCOMMITHASH) msgid "Pick commit &hash" -msgstr "" +msgstr "Chọn &hash giao thác" #. Resource IDs: (IDS_COMMITDLG_POPUP_PICKCOMMITMESSAGE) msgid "Pick commit &message" -msgstr "" +msgstr "Chọn &thông điệp giao thác" #. Resource IDs: (IDS_PROC_PICK) #, c-format msgid "Pick up %s" -msgstr "" +msgstr "Chọn %s" #. Resource IDs: (AFX_IDS_METAFILE_FORMAT) msgid "" @@ -7685,17 +7728,17 @@ msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" -msgstr "" +msgstr "Ảnh (*.svg, *.wmf, *.jpg, *.png, *.bmp, *.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Biểu đồ (*.gv)|*.gv|Tất cả tệp (*.*)|*.*||" #. Resource IDs: (IDS_STATPICFILEFILTER) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" -msgstr "" +msgstr "Ảnh (*.wmf, *.jpg, *.png, *.bmp, *.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Tất cả tệp (*.*)|*.*||" #. Resource IDs: (IDS_STATGRAPH_PIEBUTTON_TT) msgid "Pie Graph" -msgstr "Biểu đồ bánh" +msgstr "Biểu đồ tròn" #. Resource IDs: (IDS_ERR_NOHOOKCOMMANDPECIFIED) msgid "Please enter a hook script to execute." @@ -7749,7 +7792,7 @@ msgstr "Vui lòng chờ..." #. Resource IDs: (65535 - PopupMenu) msgid "Popup" -msgstr "" +msgstr "Hộp thoại" #. Resource IDs: (Dialog AFX_IDD_PRINTDLG: Control id 65535) msgid "Port :" @@ -7757,7 +7800,7 @@ msgstr "Cổng :" #. Resource IDs: (Dialog IDD_SETTINGSMTP: Control id 1758) msgid "Port:" -msgstr "" +msgstr "Cổng:" #. Resource IDs: (IDS_HOOKTYPE_POSTCOMMIT) msgid "Post-Commit Hook" @@ -7801,7 +7844,7 @@ msgstr "Xem trước tập tin được vá" #. Resource IDs: (ID_VIEW_PREV - Menu) msgid "Previous" -msgstr "" +msgstr "Trước" #. Resource IDs: (IDS_PROC_PREVIOUSVERSION) msgid "Previous Version" @@ -7844,7 +7887,7 @@ msgstr "Máy in:" #. Resource IDs: (AFX_IDS_PRINTFILTER) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" -msgstr "Các tập tin máy in (*.prn)|*.prn|All Files (*.*)|*.*||" +msgstr "Các tệp máy in (*.prn)|*.prn|Tất cả tệp (*.*)|*.*||" #. Resource IDs: (Dialog AFX_IDD_PRINTDLG: Control id 65535) msgid "Printing" @@ -7852,7 +7895,7 @@ msgstr "Đang in" #. Resource IDs: (IDS_HOOK_FORCEDPROCEED) msgid "Proceed anyway" -msgstr "" +msgstr "Vẫn tiếp tục" #. Resource IDs: (IDS_PROGS_TOOLCOL) msgid "Program" @@ -7869,7 +7912,7 @@ msgstr "Tiến triển" #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1772, Dialog #. IDD_SETTINGSDIALOGS3: Control id 1772, IDS_CONFIG_PROJECT) msgid "Project" -msgstr "" +msgstr "Dự án" #. Resource IDs: (IDS_PROPPROPERTY) msgid "Property" @@ -7937,11 +7980,11 @@ msgstr "" #. Resource IDs: (IDS_PROC_SYNC_PUSH) msgid "Pus&h" -msgstr "" +msgstr "Đẩ&y" #. Resource IDs: (IDS_MENUPUSH) msgid "Pus&h..." -msgstr "" +msgstr "Đẩ&y..." #. Resource IDs: (Dialog IDD_PUSH: Control id 303, Dialog IDD_SYNC: Control id #. 1612) @@ -7950,7 +7993,7 @@ msgstr "Đẩy" #. Resource IDs: (Dialog IDD_PUSH: Control id 1492) msgid "Push &option:" -msgstr "" +msgstr "&Tùy chọn đẩy:" #. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 1786) msgid "Push Default" @@ -7958,7 +8001,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 65535) msgid "Push URL:" -msgstr "" +msgstr "URL đẩy:" #. Resource IDs: (IDS_MENUDESCPUSH) msgid "Push commits to a remote repository." @@ -7974,11 +8017,11 @@ msgstr "" #. Resource IDs: (Dialog IDD_SETTINREMOTE: Control id 65535) msgid "Putty Key:" -msgstr "" +msgstr "Khóa Putty:" #. Resource IDs: (IDS_PUTTYKEYFILEFILTER) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" -msgstr "" +msgstr "Khóa riêng tư Putty (*.ppk)|*.ppk|Tất cả tệp (*.*)|*.*||" #. Resource IDs: (57665, cmdExit) msgid "" @@ -8041,7 +8084,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_PUSH: Control id 1494) msgid "Re&mote:" -msgstr "" +msgstr "&Từ xa:" #. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1048) msgid "Re&movable drives" @@ -8177,7 +8220,7 @@ msgstr "Làm mới" #. Resource IDs: (IDS_PROC_SYNC_REFRESHING) msgid "Refreshing..." -msgstr "" +msgstr "Đang làm mới..." #. Resource IDs: (65535 - PopupMenu, Dialog IDD_REGEXFILTER: Control id 165, #. cmdRegexFilterConfig1, cmdRegexFilterConfig1_LabelTitle_RESID) @@ -8246,15 +8289,15 @@ msgstr "Từ xa" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 65535, Dialog #. IDD_SELECTREMOTEREF: Control id 65535) msgid "Remote &Branch:" -msgstr "" +msgstr "&Nhánh từ xa:" #. Resource IDs: (Dialog IDD_SYNC: Control id 1618) msgid "Remote &URL:" -msgstr "" +msgstr "&URL từ xa:" #. Resource IDs: (Dialog IDD_SUBMODULE_UPDATE: Control id 1754) msgid "Remote &tracking branch" -msgstr "" +msgstr "Nhánh &theo dõi từ xa" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 65535, #. IDS_PROC_REMOTEBRANCH) @@ -8263,23 +8306,23 @@ msgstr "Nhánh từ xa" #. Resource IDs: (IDS_TAGCOMPARE_REMOTEHASH) msgid "Remote SHA1" -msgstr "" +msgstr "SHA1 từ xa" #. Resource IDs: (IDS_PROC_GITCONFIG_URLEMPTY) msgid "Remote URL must not be empty." -msgstr "" +msgstr "URL từ xa không thể để trống." #. Resource IDs: (IDS_PROC_SYNC_REMOTEUPDATE) msgid "Remote Update" -msgstr "" +msgstr "Cập nhật từ xa" #. Resource IDs: (IDS_TAGCOMPARE_REMOTEMESSAGE) msgid "Remote message" -msgstr "" +msgstr "Thông điệp từ xa" #. Resource IDs: (IDS_PROC_GITCONFIG_REMOTEEMPTY) msgid "Remote name must not be empty." -msgstr "" +msgstr "Tên từ xa không thể để trống." #. Resource IDs: (IDS_CHSTAT_REPOCOL) msgid "Remote status" @@ -8330,7 +8373,7 @@ msgstr "Loại bỏ khỏi danh sách &bỏ qua" #. Resource IDs: (IDS_STATUSLIST_CONTEXT_REMOVEFROMCS) msgid "Remove from changelist" -msgstr "Loại bỏ khỏi danh sách bỏ qua" +msgstr "Loại bỏ khỏi danh sách thay đổi" #. Resource IDs: (Dialog IDD_CLEAN: Control id 1629) msgid "Remove ignored files (-fX)" @@ -8384,7 +8427,7 @@ msgstr "Đổi tên %s" #. Resource IDs: (Dialog IDD_RENAME: Control id 151) msgid "Rename - TortoiseGit" -msgstr "" +msgstr "Đổi tên - TortoiseGit" #. Resource IDs: (IDS_RENAME_INFO) #, c-format @@ -8407,7 +8450,7 @@ msgstr "Lập lại hành động cuối cùng\nLập lại" #. Resource IDs: (Dialog IDD_FIND: Control id 1512) msgid "Replace &All" -msgstr "" +msgstr "Đổi tên &tất cả" #. Resource IDs: (57641) msgid "" @@ -8521,7 +8564,8 @@ msgstr "Khôi phục" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "Khôi phục mặc định" @@ -8675,11 +8719,6 @@ msgstr "" msgid "S" msgstr "" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "" @@ -8976,7 +9015,7 @@ msgstr "Scintilla" #. Resource IDs: (ID_FILE_SETTINGS - Menu) msgid "Se&ttings..." -msgstr "" +msgstr "Cà&i đặt..." #. Resource IDs: (IDS_LOG_POPUP_FIND) msgid "Search &log messages..." @@ -8984,7 +9023,7 @@ msgstr "Tìm kiếm trên các &thông điệp tường trình..." #. Resource IDs: (Dialog IDD_FIND: Control id 1074) msgid "Search &up" -msgstr "" +msgstr "Tìm &lên" #. Resource IDs: (Dialog IDD_FIND: Control id 65535) msgid "Search for:" @@ -9075,8 +9114,8 @@ msgstr "" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "Chọn biểu hiện của hộp thoại tiến triển vào cuối tác vụ." +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9112,7 +9151,8 @@ msgstr "" #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "" @@ -9122,7 +9162,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_SENDMAIL: Control id 1) msgid "Send" -msgstr "" +msgstr "Gửi" #. Resource IDs: (IDS_PROGRS_CMD_SENDMAIL) msgid "Send Email" @@ -9445,6 +9485,11 @@ msgstr "" msgid "Show long format even if a tag is exactly on that commit" msgstr "" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9676,6 +9721,20 @@ msgstr "Chồng các đồ thị thanh" msgid "Stacked Line Graph" msgstr "Chồng các đồ thị dòng" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "Tiêu chuẩn" @@ -9771,7 +9830,7 @@ msgstr "" #. Resource IDs: (IDS_STATE) msgid "State" -msgstr "" +msgstr "Trạng thái" #. Resource IDs: (Dialog IDD_GITPROGRESS: Control id 1487, Dialog #. IDD_RESOLVE_CONFLICT: Control id 4572, Dialog IDD_RESOLVE_CONFLICT: Control @@ -9790,7 +9849,7 @@ msgstr "Trạng thái" #. Resource IDs: (cmdViewStatusBar_LabelTitle_RESID) msgid "Status Bar" -msgstr "" +msgstr "Thanh trạng thái" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 65535) msgid "Status and action colors" @@ -9839,7 +9898,7 @@ msgstr "" #. Resource IDs: (IDS_LOG_FILTER_SUBJECT, IDS_SUBJECT) msgid "Subject" -msgstr "" +msgstr "Chủ đề" #. Resource IDs: (Dialog IDD_DIFFSUBMODULE: Control id 1714, Dialog #. IDD_DIFFSUBMODULE: Control id 1715, Dialog IDD_RESOLVESUBMODULECONFLICT: @@ -9847,7 +9906,7 @@ msgstr "" #. Dialog IDD_RESOLVESUBMODULECONFLICT: Control id 1717, Dialog IDD_SENDMAIL: #. Control id 65535) msgid "Subject:" -msgstr "" +msgstr "Chủ đề:" #. Resource IDs: (IDS_LOG_POPUP_CLIPBOARD_SUBJECTS) msgid "Subjects" @@ -9999,7 +10058,7 @@ msgstr "" #. Resource IDs: (IDS_MENUSYNC) msgid "Sync..." -msgstr "" +msgstr "Đồng bộ..." #. Resource IDs: (Dialog IDD_SETTINGIT_CONFIG: Control id 1774, Dialog #. IDD_SETTINGSBUGTRAQ_CONFIG: Control id 1774, Dialog IDD_SETTINGSDIALOGS3: @@ -10044,15 +10103,15 @@ msgstr "Kích thước dấu tab:" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 65535, IDS_PROC_TAG) msgid "Tag" -msgstr "" +msgstr "Nhãn" #. Resource IDs: (IDS_PROC_TAG_FF) msgid "Tag (FF)" -msgstr "" +msgstr "Nhãn (FF)" #. Resource IDs: (IDS_PROC_LOG_TAGINFO) msgid "Tag Info" -msgstr "" +msgstr "Thông tin nhãn" #. Resource IDs: (IDS_LOG_POPUP_CLIPBOARD_TAGBRANCHES) msgid "Tag/branch names" @@ -10609,7 +10668,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_DIFFSUBMODULE: Control id 1676) msgid "To" -msgstr "" +msgstr "Đến" #. Resource IDs: (IDS_PROC_GITCONFIG_ASKTAGOPT) msgid "" @@ -10636,6 +10695,14 @@ msgstr "Đến:" msgid "Toggle filters" msgstr "" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10655,7 +10722,7 @@ msgstr "TortoiseGit %d.%d.%d.%d %s\n%s\n" #. Resource IDs: (IDS_FIRSTSTART_LANGUAGEHINT1) msgid "TortoiseGit can be localized using language packs." -msgstr "" +msgstr "TortoiseGit có thể được nội bộ hóa bằng các gói ngôn ngữ." #. Resource IDs: (IDS_ASK_REMOVE_FROM_INDEX) #, c-format @@ -10755,8 +10822,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10824,7 +10891,7 @@ msgstr "Tổng số thay đổi tập tin:" #. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1520) msgid "Trac&k" -msgstr "" +msgstr "T&heo dõi" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 11023) msgid "Tracked Remote Branch:" @@ -10836,7 +10903,7 @@ msgstr "" #. Resource IDs: (IDS_TRACKEDBRANCH) msgid "Tracked branch" -msgstr "" +msgstr "Nhánh đang theo dõi" #. Resource IDs: (IDS_SVN_PROGRESS_SPEED) #, c-format @@ -10953,6 +11020,11 @@ msgstr "Không thể ghi vào %1, nó là chỉ-đọc hoặc được mở bở msgid "Uncheck" msgstr "Bỏ chọn" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11008,7 +11080,7 @@ msgstr "" #. Resource IDs: (IDS_MENULFSUNLOCK, IDS_PROGRS_CMD_LFS_UNLOCK) msgid "Unlock" -msgstr "" +msgstr "Mở khóa" #. Resource IDs: (IDS_MENUDESCLFSUNLOCK) msgid "Unlocks a file using LFS" @@ -11026,6 +11098,16 @@ msgstr "Các mâu thuẫn chưa được giải quyết!" msgid "Unset tracked branch" msgstr "" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "Không tiêu đề" @@ -11080,30 +11162,10 @@ msgstr "Dùng chế độ xem &một bảng như là mặc định cho việc so msgid "Use &other text block" msgstr "Sử dụng khối văn bản &khác" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "Sử dụng khối văn bản 'của tôi'" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "Sử dụng khối văn bản 'của tôi' rồi đến 'của họ'" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "Sử dụng khối 'của họ'" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "Sử dụng khối văn bản 'của họ' rồi đến 'của tôi'" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "" @@ -11162,11 +11224,11 @@ msgstr "Sử dụng cả hai khối văn bản (cái này cuối)" #. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1128) msgid "Use commit dates" -msgstr "" +msgstr "Sử dụng ngày giao thác" #. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1127) msgid "Use committer names" -msgstr "" +msgstr "Sử dụng tên người giao thác" #. Resource IDs: (IDS_COMMON_ANCESTOR) msgid "Use common ancestor (A...B diff)" @@ -11189,11 +11251,13 @@ msgstr "Sử dụng khối bên trái" msgid "Use left file" msgstr "Dùng tập tin bên trái" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "" @@ -11213,11 +11277,12 @@ msgstr "Dùng biểu thức thông thường" msgid "Use right block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "" @@ -11330,7 +11395,7 @@ msgstr "" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) msgid "User Name:" -msgstr "" +msgstr "Tên người dùng:" #. Resource IDs: (IDS_USERCANCELLED) msgid "User cancelled" @@ -11438,10 +11503,19 @@ msgstr "" msgid "View Bars" msgstr "" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11484,10 +11558,10 @@ msgstr "Chờ cho kịch bản hoàn tất" #. Resource IDs: (IDS_PROC_SYNC_WAINTINPUT) msgid "Waiting for input" -msgstr "" +msgstr "Đang chờ đầu vào" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" +msgid "Walk Be&havior" msgstr "" #. Resource IDs: (IDS_WARN_WARNING) @@ -11574,6 +11648,20 @@ msgstr "" msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11600,6 +11688,10 @@ msgstr "" msgid "Whitespaces" msgstr "Khoảng trắng" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -11646,15 +11738,15 @@ msgstr "" #. Resource IDs: (Dialog IDD_CHANGEDFILES: Control id 158, IDS_WORKING_TREE) msgid "Working Tree" -msgstr "" +msgstr "Cây làm việc" #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQADV: Control id 1472) msgid "Working Tree Path:" -msgstr "" +msgstr "Đường dẫn cây làm việc:" #. Resource IDs: (IDS_LOG_WORKINGDIRCHANGES) msgid "Working tree changes" -msgstr "" +msgstr "Các thay đổi trong cây làm việc" #. Resource IDs: (cmdViewWrapLines_LabelTitle_RESID) msgid "Wrap Lines" @@ -12029,9 +12121,13 @@ msgstr "" msgid "file/foldernames" msgstr "" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" -msgstr "" +msgstr "đường dẫn đầy đủ" #. Resource IDs: (IDS_PROC_PROGRESS_GITUNCLEANEXIT) #, c-format @@ -12083,7 +12179,7 @@ msgid "" "%s = %ld\n" "%s = %ld\n" "%s = %ld" -msgstr "" +msgstr "dòng: %d(+) %d(-) các tệp: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" #. Resource IDs: (IDS_STATUSLIST_STATUSLINE2) #, c-format @@ -12187,7 +12283,7 @@ msgstr "" #. Resource IDs: (cmdOpen_Keytip_RESID) msgid "o1" -msgstr "" +msgstr "o1" #. Resource IDs: (IDS_STATUSOBSTRUCTED) msgid "obstructed" @@ -12266,10 +12362,6 @@ msgstr "sang %1" msgid "to %s" msgstr "sang %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "tuần" diff --git a/Languages/Tortoise_zh_CN.po b/Languages/Tortoise_zh_CN.po index 0ceec6f69..8932210d0 100644 --- a/Languages/Tortoise_zh_CN.po +++ b/Languages/Tortoise_zh_CN.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -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: 2021-03-19 19:23+0000\n" -"Last-Translator: YFdyh000 \n" +"PO-Revision-Date: 2022-01-24 04:12+0000\n" +"Last-Translator: lznuaa \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" @@ -738,9 +738,10 @@ msgstr "日志信息字体(&F): " msgid "&Font:" msgstr "字体(&F): " -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "强制(&F)" @@ -1254,6 +1255,10 @@ msgstr "并合(&S)" msgid "&Squash ALL" msgstr "并合全部(&S)" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "开始(&S)" @@ -1358,6 +1363,10 @@ msgstr "未知磁盘(&U)" msgid "&Unlock" msgstr "＆开锁" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "向上(&U)" @@ -1413,14 +1422,14 @@ msgstr "是(&Y)" msgid "&add \"cherry picked from\"" msgstr "添加“摘取自”(&A)" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "忽略空格变更(&I)" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "已知变更(&K)" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(TortoiseGit默认)" @@ -2933,6 +2942,10 @@ msgstr "关闭当前窗口并提示保存文件" msgid "Collapse" msgstr "折叠" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -4676,6 +4689,10 @@ msgstr "可执行 (+x)" msgid "Exit" msgstr "退出" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "浏览" @@ -5193,10 +5210,6 @@ msgstr "尽管当前分支是你想变基到的后裔节点，也要强制变基 msgid "Force unlock" msgstr "强制解锁" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "强制：可能/可以丢弃" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5279,6 +5292,10 @@ msgstr "完整提交数据，无已更改路径" msgid "Full data" msgstr "完整数据" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "全文搜索" @@ -5589,6 +5606,14 @@ msgstr "对于未版本控制的路径隐藏菜单" msgid "Hide Patch<<" msgstr "隐藏补丁<<" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "运行时隐藏脚本" @@ -6230,6 +6255,13 @@ msgstr "非法货币。" msgid "Invalid revision number!" msgstr "无效的修订版本号！" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" msgstr "问题跟踪器配置" @@ -6283,7 +6315,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "保持" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "保持修改列表" @@ -6305,7 +6337,7 @@ msgstr "韩语" msgid "L" msgstr "L" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "LFS" @@ -7592,6 +7624,16 @@ msgstr "%2!s! 的父节点" msgid "Parent(s)" msgstr "父节点" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "密码" @@ -8550,7 +8592,8 @@ msgstr "恢复" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "恢复默认值" @@ -8704,11 +8747,6 @@ msgstr "运行，当工作树路径位于：" msgid "S" msgstr "S" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "显示工作树中修改的文件(&H)" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "跳过未选中(&K)" @@ -9104,8 +9142,8 @@ msgstr "选择远端 ref - TortoiseGit" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "选择进度窗口在操作后的特性。" +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9141,7 +9179,8 @@ msgstr "选择您想另存为的文件\n注意：有未解决的冲突！" #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "全选/取消(&A)" @@ -9474,6 +9513,11 @@ msgstr "显示日志..." msgid "Show long format even if a tag is exactly on that commit" msgstr "即便一个标签已在提交中精确描述，仍然显示长格式" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9705,6 +9749,20 @@ msgstr "叠加柱状图" msgid "Stacked Line Graph" msgstr "叠加折线图" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "标准" @@ -10665,6 +10723,14 @@ msgstr "至:" msgid "Toggle filters" msgstr "切换过滤器" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10784,8 +10850,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseIDiff: TortoiseSVN 的图片差异查看器\n\n可用的命令行参数:\n/left: “左侧文件的路径”\n/lefttitle: “左侧窗口的标题”\n/right: “右侧文件的路径”\n/righttitle: “右侧窗口的标题”\n/overlay\t\t启用覆盖模式\n/fit\t\t适合图像尺寸\n/showinfo\t\t显示图像信息框" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10982,6 +11048,11 @@ msgstr "无法写入 %1，它可能是只读或者已被其他人打开。" msgid "Uncheck" msgstr "取消选中" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11055,6 +11126,16 @@ msgstr "未解决的冲突！" msgid "Unset tracked branch" msgstr "取消跟踪分支" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "未命名" @@ -11109,30 +11190,10 @@ msgstr "对两个文件进行比较时默认使用单窗口方式(&O)" msgid "Use &other text block" msgstr "使用其他文本块(&O)" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "使用“现有”文本块" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "先使用“现有”文本块，然后才是“到来”" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "使用“到来”文本块" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "先使用“到来”文本块，然后才是“现有”" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "使用 .mailmap" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "使用HTTP路径组件" @@ -11218,11 +11279,13 @@ msgstr "使用左边文件块" msgid "Use left file" msgstr "使用左边的文件" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "使用左侧文本块" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "优先使用左侧文本块" @@ -11242,11 +11305,12 @@ msgstr "使用正则表达式" msgid "Use right block" msgstr "使用右侧内容" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "使用右侧文本块" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "优先使用右侧文本块" @@ -11467,10 +11531,19 @@ msgstr "查看 .tgitconfig" msgid "View Bars" msgstr "视图栏" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "查看补丁" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11516,8 +11589,8 @@ msgid "Waiting for input" msgstr "等待输入" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" -msgstr "遍历方法(&H)" +msgid "Walk Be&havior" +msgstr "" #. Resource IDs: (IDS_WARN_WARNING) msgid "Warning" @@ -11603,6 +11676,20 @@ msgstr "如果远端名称为空，在您键入 URL 时，远端名称将自动 msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "是否只引用标签，或者所有标签或所有引用" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11629,6 +11716,10 @@ msgstr "空白字符的变化（制表符、空格）" msgid "Whitespaces" msgstr "空白字符" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12058,6 +12149,10 @@ msgstr "文件，非子模块" msgid "file/foldernames" msgstr "文件/文件夹名称" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "完整路径" @@ -12295,10 +12390,6 @@ msgstr "至 %1" msgid "to %s" msgstr "至 %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "未知变更(&N)" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "周" diff --git a/Languages/Tortoise_zh_TW.po b/Languages/Tortoise_zh_TW.po index bc0bdbb2e..a6fc6d765 100644 --- a/Languages/Tortoise_zh_TW.po +++ b/Languages/Tortoise_zh_TW.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2021 the TortoiseGit team +# Copyright (C) 2008-2022 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -8,7 +8,7 @@ # b3913ac4b2e2c95732350f21c7eb54c9_61fcf8a <5dee753d03900635d4f59be6489e6841_823413>, 2019 # b3913ac4b2e2c95732350f21c7eb54c9_61fcf8a <5dee753d03900635d4f59be6489e6841_823413>, 2020 # BinotaLIU , 2013 -# byStarTW (pan93412) , 2020 +# pan93412 , 2020 # Cecil Sheng , 2011,2013 # 乙酸鋰 , 2012 # 乙酸鋰 , 2012-2015 @@ -21,7 +21,7 @@ # Jin Yang , 2017 # Lübbe Onken , 2011,2014 # Nick Vrvilo , 2011 -# Sven Strickroth , 2013,2018 +# Sven Strickroth , 2013,2018,2021 # Will保哥 , 2020 # Yue Lin Ho , 2014-2020 # 乙酸鋰 , 2012,2017,2019 @@ -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: 2021-02-26 18:18+0000\n" +"PO-Revision-Date: 2022-01-03 14:09+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" @@ -726,9 +726,10 @@ msgstr "日誌訊息字型(&F)：" msgid "&Font:" msgstr "字型(&F)：" -#. Resource IDs: (Dialog IDD_NEW_BRANCH_TAG: Control id 1521, Dialog -#. IDD_SUBMODULE_ADD: Control id 1480, Dialog IDD_SUBMODULE_UPDATE: Control id -#. 1480, Dialog IDD_SYNC: Control id 1521) +#. Resource IDs: (Dialog IDD_LFS_LOCKS: Control id 1480, Dialog +#. IDD_NEW_BRANCH_TAG: Control id 1521, Dialog IDD_SUBMODULE_ADD: Control id +#. 1480, Dialog IDD_SUBMODULE_UPDATE: Control id 1480, Dialog IDD_SYNC: +#. Control id 1521) msgid "&Force" msgstr "強制(&F)" @@ -1242,6 +1243,10 @@ msgstr "壓合(&S)" msgid "&Squash ALL" msgstr "壓合全部(&S)" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Staging" +msgstr "" + #. Resource IDs: (Dialog IDD_REQUESTPULL: Control id 1616) msgid "&Start" msgstr "開始(&S)" @@ -1346,6 +1351,10 @@ msgstr "未知磁碟(&U)" msgid "&Unlock" msgstr "" +#. Resource IDs: (65535 - PopupMenu) +msgid "&Unstaging" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "向上(&U)" @@ -1401,14 +1410,14 @@ msgstr "是(&Y)" msgid "&add \"cherry picked from\"" msgstr "加入「cherry picked from」(&A)" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) +msgid "&force" +msgstr "" + #. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1657) msgid "&ignore space change" msgstr "忽略空格變更(&I)" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) -msgid "&known changes" -msgstr "已知的變更(&K)" - #. Resource IDs: (IDS_TORTOISEGITDEFAULT) msgid "(TortoiseGit default)" msgstr "(TortoiseGit 預設)" @@ -1864,7 +1873,7 @@ msgstr "已經是最新的。" #. Resource IDs: (Dialog IDD_SETTINGSPROGSALTERNATIVEEDITOR: Control id 333) msgid "Alternative editor" -msgstr "" +msgstr "編輯器" #. Resource IDs: (Dialog IDD_PUSH: Control id 1482) msgid "Always push to the selected remote archive for this local branch" @@ -2161,7 +2170,7 @@ msgstr "在輸入日誌訊息時，自動從這次有修改的檔案內容中提 #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) msgid "AutoCrLf:" -msgstr "" +msgstr "AutoCrLf:" #. Resource IDs: (Dialog IDD_PULLFETCH: Control id 1505) msgid "AutoLoad Putty &Key" @@ -2921,6 +2930,10 @@ msgstr "關閉目前視窗並提示儲存文件" msgid "Collapse" msgstr "摺疊" +#. Resource IDs: (IDS_LOG_POPUP_COLLAPSE) +msgid "Collapse revisions" +msgstr "" + #. Resource IDs: (cmdViewCollapsed) msgid "" "Collapse unchanged sections\n" @@ -2939,15 +2952,15 @@ msgstr "色彩" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 315) msgid "Colors 1" -msgstr "" +msgstr "顏色1" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_2: Control id 212) msgid "Colors 2" -msgstr "" +msgstr "顏色2" #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_3: Control id 316) msgid "Colors 3" -msgstr "" +msgstr "顏色3" #. Resource IDs: (IDS_INDICATOR_COLUMN) #, c-format @@ -3227,11 +3240,11 @@ msgstr "衝突：%d" #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195) msgid "Context Menu" -msgstr "" +msgstr "快顯功能表" #. Resource IDs: (Dialog IDD_SETTINGSEXTMENU: Control id 4573) msgid "Context Menu 2" -msgstr "" +msgstr "快顯功能表 2" #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535) msgid "Context lines for patches" @@ -3358,7 +3371,7 @@ msgid "" "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 "" +msgstr "在 git 版本字串中無法找到「msysgit」或「windows」關鍵字。\n如果你使用的是 Cygwin 或 MSYS2 環境下的 Git，你需要啟用專用的 hacks。\n請在說明文件中搜尋關鍵字「Cygwin Git」或「MSYS2 Git」以取得更多詳細的說明。" #. Resource IDs: (IDS_ERR_GITNOVALIDOUTPUT) #, c-format @@ -3590,7 +3603,7 @@ msgstr "正在建立拉取要求．．．" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 4591) msgid "Credential" -msgstr "" +msgstr "憑證" #. Resource IDs: (IDS_GITCREDENTIAL_HELPEREMPTY) msgid "Credential helper must not be empty." @@ -3912,15 +3925,15 @@ msgstr "視窗" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196) msgid "Dialogs 1" -msgstr "" +msgstr "對話視窗1" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 197) msgid "Dialogs 2" -msgstr "" +msgstr "對話視窗2" #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 4593) msgid "Dialogs 3" -msgstr "" +msgstr "對話視窗3" #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID) msgid "Diff" @@ -4664,6 +4677,10 @@ msgstr "可執行 (+x)" msgid "Exit" msgstr "離開" +#. Resource IDs: (IDS_LOG_POPUP_EXPAND) +msgid "Expand collapsed revisions" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE) msgid "Explore to" msgstr "瀏覽至" @@ -5181,10 +5198,6 @@ msgstr "儘管你想要變基的基準點是目前分支的後裔節點，也要 msgid "Force unlock" msgstr "" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1796) -msgid "Force: May discard" -msgstr "強制：可能丟失" - #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog #. IDD_SETTINGSUDIFF: Control id 65535) msgid "Foreground" @@ -5203,14 +5216,14 @@ msgstr "向前 %d" msgid "" "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 "" +msgstr "在 git 版本字串中找到「msysgit」或「windows」關鍵字，然而，你啟用了 git.exe hacks；這些 hacks 必需被關閉才能正常使用 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 running a TortoiseGit rebase process right now, you can remove the stale lock file in order to continue." -msgstr "" +msgstr "找到了一個鎖定檔案，它被用來表示正在執行 TortoiseGit 變基（Rebase）操作，而這個檔會阻擋目前的操作。\n\n如果你並沒有正在執行 TortoiseGit 變基操作，你可以移除這個不適用的鎖定檔案，以便繼續往下操作。" #. Resource IDs: (IDS_PROC_REBASE_EMPTYCOMMITMSG) msgid "" @@ -5267,6 +5280,10 @@ msgstr "完整的提交資料（不含修改檔案路徑）" msgid "Full data" msgstr "完整資料" +#. Resource IDs: (IDS_WALKBEHAVIOUR_FULLHISTORY) +msgid "Full history" +msgstr "" + #. Resource IDs: (Dialog IDD_FIND: Control id 20086) msgid "Full text search" msgstr "全文檢索" @@ -5577,6 +5594,14 @@ msgstr "在尚未版本控制的資料夾上隱藏選單" msgid "Hide Patch<<" msgstr "隱藏補綴<<" +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_STAGING) +msgid "Hide Staging<<" +msgstr "" + +#. Resource IDs: (IDS_PROC_COMMIT_HIDE_UNSTAGING) +msgid "Hide Unstaging<<" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1326) msgid "Hide the script while running" msgstr "隱藏執行中的指令檔" @@ -6218,13 +6243,20 @@ msgstr "不正確的貨幣." msgid "Invalid revision number!" msgstr "無效的版本編號！" +#. Resource IDs: (IDS_ERROR_PARTIALSTAGING) +msgid "" +"Invalid selection.\n" +"\n" +"If this is a single-line file that has been modified, you must click the checkbox to stage or unstage the whole file." +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ_CONFIG: Control id 4571) msgid "Issue Tracker Config" -msgstr "" +msgstr "Bug 追踪組態" #. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283) msgid "Issue Tracker Integration" -msgstr "" +msgstr "Bug 追蹤整合" #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 65535) msgid "Issuer:" @@ -6271,7 +6303,7 @@ msgstr "KOI8-U" msgid "Keep" msgstr "保留" -#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126) +#. Resource IDs: (IDS_STATUSLIST_CONTEXT_KEEPCHANGELISTS) msgid "Keep changelists" msgstr "保留變更列表" @@ -6293,7 +6325,7 @@ msgstr "韓文" msgid "L" msgstr "L" -#. Resource IDs: (Dialog IDD_CLONE: Control id 1847, IDS_MENULFS) +#. Resource IDs: (IDS_MENULFS) msgid "LFS" msgstr "LFS" @@ -6708,7 +6740,7 @@ msgstr "合併-重新整合" #. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193) msgid "Merge Tool" -msgstr "" +msgstr "合併工具" #. Resource IDs: (IDS_PROC_SWITCH_MERGE_TT) msgid "" @@ -7495,7 +7527,7 @@ msgstr "Output.prn" #. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 338) msgid "Overlay Handlers" -msgstr "" +msgstr "覆蓋處理程式" #. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_OVERWRITE) msgid "Overwrite" @@ -7580,6 +7612,16 @@ msgstr "%2!s!的親代" msgid "Parent(s)" msgstr "父版本" +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1639, +#. IDS_PROC_COMMIT_PARTIAL_STAGING) +msgid "Partial Staging>>" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1638, +#. IDS_PROC_COMMIT_PARTIAL_UNSTAGING) +msgid "Partial Unstaging>>" +msgstr "" + #. Resource IDs: (Dialog IDD_USER_PASSWD: Control id 4585) msgid "Password" msgstr "密碼" @@ -8538,7 +8580,8 @@ msgstr "還原" #. id 1254, Dialog IDD_SETTINGSCOLORS_3: Control id 1254, Dialog #. IDD_SETTINGSEXTMENU: Control id 1254, Dialog IDD_SETTINGSLOOKANDFEEL: #. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog -#. IDD_SETTINGSUDIFF: Control id 1254) +#. IDD_SETTINGSUDIFF: Control id 1254, Dialog IDD_SETTINGSWIN11CONTEXTMENU: +#. Control id 1254) msgid "Restore Default" msgstr "還原預設值" @@ -8692,11 +8735,6 @@ msgstr "當工作目錄如下時執行：" msgid "S" msgstr "S" -#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: -#. Control id 1383) -msgid "S&how modified files in working tree" -msgstr "顯示工作目錄中已修改的檔案 (&H)" - #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_SKIP) msgid "S&kip unselected" msgstr "略過未選取的(&K)" @@ -8780,7 +8818,7 @@ msgstr "Sa&feCrLf:" #. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535) msgid "SafeCrLf:" -msgstr "" +msgstr "SafeCrLf:" #. Resource IDs: (IDS_SAME, IDS_TAGCOMPARE_SAME) msgid "Same" @@ -9092,8 +9130,8 @@ msgstr "選取遠端參考 - TortoiseGit" #. Resource IDs: (IDS_SETTINGS_AUTOCLOSE_TT) msgid "" -"Select the behaviour of the progress dialog at the end of the operation." -msgstr "選擇作業完成時進度視窗的行為" +"Select the behavior of the progress dialog at the end of the operation." +msgstr "" #. Resource IDs: (57642) msgid "" @@ -9129,7 +9167,8 @@ msgstr "請選擇你要另存的檔案\n注意：尚有未解決的衝突！" #. Control id 1067, Dialog IDD_LFS_LOCKS: Control id 1067, Dialog IDD_RESOLVE: #. Control id 1067, Dialog IDD_REVERT: Control id 1067, Dialog #. IDD_SETTINGSEXTMENU: Control id 1067, Dialog IDD_SETTINGSLOOKANDFEEL: -#. Control id 1067, Dialog IDD_SUBMODULE_UPDATE: Control id 1067) +#. Control id 1067, Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 1067, +#. Dialog IDD_SUBMODULE_UPDATE: Control id 1067) msgid "Select/deselect &all" msgstr "全部選擇或取消(&A)" @@ -9462,6 +9501,11 @@ msgstr "顯示日誌..." msgid "Show long format even if a tag is exactly on that commit" msgstr "即使標籤已位於該提交上，仍然顯示長格式。" +#. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET: +#. Control id 1383) +msgid "Show modified files in &working tree" +msgstr "" + #. Resource IDs: (25308) msgid "" "Show next change of selected commit\n" @@ -9693,6 +9737,20 @@ msgstr "堆疊長條圖" msgid "Stacked Line Graph" msgstr "堆疊直線圖" +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_HUNKS, ID_STAGING_STAGESELECTEDHUNKS +#. - Menu) +msgid "Stage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_STAGE_SELECTED_LINES, ID_STAGING_STAGESELECTEDLINES +#. - Menu) +msgid "Stage selected &lines" +msgstr "" + +#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1855) +msgid "Staging support (EXPERIMENTAL)" +msgstr "" + #. Resource IDs: (IDS_TOOLBAR_STANDARD) msgid "Standard" msgstr "標準" @@ -10653,6 +10711,14 @@ msgstr "到：" msgid "Toggle filters" msgstr "反向選取篩選器" +#. Resource IDs: (IDS_STATUSLIST_TOOMANYITEMS) +msgid "Too many files to display." +msgstr "" + +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "Top context menu on Windows 11" +msgstr "" + #. Resource IDs: (Dialog IDD_CERTCHECK: Control id 4594, Dialog #. IDD_SETTINGSMAIN: Control id 65535, IDS_APPNAME) msgid "TortoiseGit" @@ -10748,7 +10814,7 @@ msgid "" "\n" "TortoiseGitBlame.Document\n" "TortoiseGitBlame.Document" -msgstr "" +msgstr "TortoiseGitBlame\n\nTortoiseGitBlame\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" #. Resource IDs: (Dialog IDD_ABOUT: Control id 153, IDS_APP_TITLE) msgid "TortoiseGitIDiff" @@ -10772,8 +10838,8 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "TortoiseGitIDiff：TortoiseSVN 的影像檔案差異檢視器\n\n以下是可用的命令列參數：\n/left:\"左方檔案的路徑\"\n/lefttitle:\"左方視窗的標題\"\n/right:\"右方檔案的路徑\"\n/righttitle:\"右方視窗的標題\"\n/overlay\t\t啟用覆蓋模式\n/fit\t\t符合影像大小\n/showinfo\t\t顯示影像資訊" -#. Resource IDs: (100, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control -#. id 130, IDS_APPNAME) +#. Resource IDs: (1, 32897, AFX_IDS_APP_TITLE, Dialog IDD_OPENDLG: Control id +#. 130, IDS_APPNAME) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" @@ -10970,6 +11036,11 @@ msgstr "無法寫入 %1, 它可能被設為唯讀或另有人開啟." msgid "Uncheck" msgstr "取消勾選" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 65535) +msgid "" +"Unchecked items are not shown in the top menu but only in the original menu" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535) msgid "" "Unchecked items will appear in the TortoiseGit submenu, checked items " @@ -11043,6 +11114,16 @@ msgstr "未消除的衝突！" msgid "Unset tracked branch" msgstr "取消遠端追蹤分支" +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_HUNKS, +#. ID_UNSTAGING_UNSTAGESELECTEDHUNKS - Menu) +msgid "Unstage selected &hunks" +msgstr "" + +#. Resource IDs: (IDS_PROC_UNSTAGE_SELECTED_LINES, +#. ID_UNSTAGING_UNSTAGESELECTEDLINES - Menu) +msgid "Unstage selected &lines" +msgstr "" + #. Resource IDs: (AFX_IDS_UNTITLED) msgid "Untitled" msgstr "未命名" @@ -11097,30 +11178,10 @@ msgstr "預設使用「單窗格」檢視二個檔案之間的差異(&O)" msgid "Use &other text block" msgstr "右區塊使用對方的區塊內容(&O)" -#. Resource IDs: (cmdUseMineBlock_LabelTitle_RESID) -msgid "Use 'mine' text block" -msgstr "使用 「我的」" - -#. Resource IDs: (cmdUseMineThenTheirsBlock_LabelTitle_RESID) -msgid "Use 'mine' text block then 'theirs'" -msgstr "我的 ＋ 對方的" - -#. Resource IDs: (cmdUseTheirsBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block" -msgstr "使用 「對方的」" - -#. Resource IDs: (cmdUseTheirsThenMineBlock_LabelTitle_RESID) -msgid "Use 'theirs' text block then 'mine'" -msgstr "對方的 ＋ 我的" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS2: Control id 1911) msgid "Use .mailmap" msgstr "使用 .mailmap" -#. Resource IDs: (IDS_PROC_USELFS_TT) -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" msgstr "使用 HTTP 路徑部分" @@ -11206,11 +11267,13 @@ msgstr "使用左區塊" msgid "Use left file" msgstr "使用左檔案" -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, +#. cmdUseTheirsBlock_LabelTitle_RESID) msgid "Use left text block" msgstr "使用「左邊」" -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, +#. cmdUseTheirsThenMineBlock_LabelTitle_RESID) msgid "Use left text block then right" msgstr "左＋右" @@ -11230,11 +11293,12 @@ msgstr "使用正規表示式" msgid "Use right block" msgstr "改用右區塊內容" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, cmdUseMineBlock_LabelTitle_RESID) msgid "Use right text block" msgstr "使用「右邊」" -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu) +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, +#. cmdUseMineThenTheirsBlock_LabelTitle_RESID) msgid "Use right text block then left" msgstr "右＋左" @@ -11455,10 +11519,19 @@ msgstr "檢視 .tgitconfig" msgid "View Bars" msgstr "顯示列" -#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH) +#. Resource IDs: (Dialog IDD_PATCH_VIEW: Control id 328, IDS_MENU_VIEWPATCH, +#. IDS_VIEWPATCH) msgid "View Patch" msgstr "檢視補綴" +#. Resource IDs: (IDS_VIEWPATCH_HEAD_INDEX) +msgid "View Patch - HEAD to index" +msgstr "" + +#. Resource IDs: (IDS_VIEWPATCH_INDEX_WORKTREE) +msgid "View Patch - index to working tree" +msgstr "" + #. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1637, Dialog IDD_DIFFFILES: #. Control id 1637, IDS_PROC_COMMIT_SHOWPATCH) msgid "View Patch>>" @@ -11504,8 +11577,8 @@ msgid "Waiting for input" msgstr "等候輸入" #. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1776) -msgid "Walk Be&haviour" -msgstr "遍歷行為(&H)" +msgid "Walk Be&havior" +msgstr "" #. Resource IDs: (IDS_WARN_WARNING) msgid "Warning" @@ -11591,6 +11664,20 @@ msgstr "如果遠端名稱為空，當你鍵入 URL 時遠端名稱將被自動 msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "搜尋參照的依據可以是\n(1)只有含附註的標籤\n(2)所有標籤\n(3)所有參照" +#. Resource IDs: (IDS_TIPSTAGINGMODE) +msgid "" +"While in this mode, the checkbox for each file reflects its staging status:\n" +"- Checked means all the changes for the file are staged\n" +"- Unchecked means all the changes for the file are unstaged\n" +"- A gray square means that only some changes for the file are staged\n" +"\n" +"Clicking the checkboxes immediately stages or unstages the whole file.\n" +"\n" +"You can also click \"Partial Staging\" or \"Partial Unstaging\". A window shows up where you can select hunks or lines in the currently selected file and stage or unstage them.\n" +"\n" +"Please note that, for performance reasons, the file's group (Modified Files, Not Versioned Files...) and status (Added, Modified, Unknown...) are not updated when clicking its checkbox. If you want to see the updated group and status, you can trigger a full refresh by pressing F5." +msgstr "" + #. Resource IDs: (IDS_NEED_TO_RESOLVE_CONFLICTS_HINT) msgid "" "While merging, i.e. integrating changes of another (remote) branch into your local branch, a conflict in at least one file occurred. This means that you need to resolve this manually (i.e., you need to integrate your changes into a file which was also modified on another branch).\n" @@ -11617,6 +11704,10 @@ msgstr "空白變更 (tabs, spaces)" msgid "Whitespaces" msgstr "空白字元" +#. Resource IDs: (Dialog IDD_SETTINGSWIN11CONTEXTMENU: Control id 4602) +msgid "Windows 11 Context Menu" +msgstr "" + #. Resource IDs: (5020 - Menu) msgid "Windows-1250" msgstr "Windows-1250" @@ -12046,6 +12137,10 @@ msgstr "檔案（非子模組）" msgid "file/foldernames" msgstr "「檔案／資料夾」名稱" +#. Resource IDs: (Dialog IDD_PUSH: Control id 1498) +msgid "force &with lease" +msgstr "" + #. Resource IDs: (IDS_STATUSLIST_CONTEXT_COPYFULLPATHS) msgid "full paths" msgstr "完整路徑" @@ -12127,15 +12222,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" @@ -12283,10 +12378,6 @@ msgstr "至 %1" msgid "to %s" msgstr "至 %s" -#. Resource IDs: (Dialog IDD_PUSH: Control id 1480) -msgid "u&nknown changes" -msgstr "未知的變更(&N)" - #. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATEXWEEK) msgid "week" msgstr "週" -- 2.11.4.GIT